Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1721775

Re: linux-next: manual merge of the scsi tree with the staging tree

Show all headers | View raw

On Mon, Aug 28, 2017 at 03:41:28PM +0000, Bart Van Assche wrote:
> On Mon, 2017-08-28 at 08:49 +0200, Greg KH wrote:
> > 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.
> 
> Hello Greg,
> 
> If you agree with the following, please communicate this to the visorhba
> authors:

<snip>

No reason you can't tell them this yourself, right?  :)

> * Most SCSI drivers exist under drivers/scsi, including the virtio-scsi and
>   xen-scsifront drivers. So why has the visorhba driver been added under
>   unisys/visorhba?

That's because right now it's still a staging driver.  Also, there are
other scsi drivers in other portions of the kernel tree (like the USB
driver), so there's no hard rule that all scsi drivers have to be under
drivers/scsi/

<snip>

Please provide this review to them, on the properly mailing list, I'm
sure they would be glad to get it.

thanks,

greg k-h

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

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