linux-next: manual merge of the scsi-mkp tree with the fixes tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the scsi-mkp tree got a conflict in:

  drivers/scsi/osd/osd_initiator.c

between commit:

  24648908acac ("scsi: osd: osd_initiator: mark expected switch fall-throughs")

from the fixes tree and commit:

  19fcae3d4f2d ("scsi: remove the SCSI OSD library")

from the scsi-mkp tree.

I fixed it up (the latter removed the file) 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.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpcFa8q9JQtX.pgp
Description: OpenPGP digital signature