Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1721060
| From | Greg KH <greg@kroah.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the scsi tree with the staging tree |
| Date | 2017-08-28 08:50 +0200 |
| Message-ID | <ujm1Y-2ab-19@gated-at.bofh.it> (permalink) |
| References | <ujm1Y-2ab-17@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Mon, Aug 28, 2017 at 04:41:27PM +1000, Stephen Rothwell wrote:
> Hi James,
>
> Today's linux-next merge of the scsi tree got a conflict in:
>
> drivers/staging/unisys/visorhba/visorhba_main.c
>
> between commits:
>
> 781facd05eb9 ("staging: unisys: visorhba: visorhba_main.c: fixed comment formatting issues")
>
> from the staging tree and commit:
>
> 7bc4e528d9f6 ("scsi: visorhba: sanitze private device data allocation")
>
> from the scsi tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
Ick, messy merge, thanks for doing this.
greg k-h
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the scsi tree with the staging tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-28 08:50 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree Greg KH <greg@kroah.com> - 2017-08-28 08:50 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree Bart Van Assche <Bart.VanAssche@wdc.com> - 2017-08-28 17:50 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree "greg@kroah.com" <greg@kroah.com> - 2017-08-28 18:10 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree Bart Van Assche <Bart.VanAssche@wdc.com> - 2017-08-28 18:40 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree "greg@kroah.com" <greg@kroah.com> - 2017-08-28 18:50 +0200
RE: linux-next: manual merge of the scsi tree with the staging tree "Wadgaonkar, Sameer Laxmikant" <Sameer.Wadgaonkar@unisys.com> - 2017-08-28 19:10 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-08-28 20:00 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree "greg@kroah.com" <greg@kroah.com> - 2017-08-28 20:50 +0200
Re: linux-next: manual merge of the scsi tree with the staging tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-09-05 02:20 +0200
csiph-web