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

[Stephen Rothwell]

Hi all,

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

  drivers/scsi/fnic/fnic.h

between commit:

  5a43b07a8783 ("scsi: fnic: Replace return codes in fnic_clean_pending_aborts()")

from Linus' tree and commit:

  15924b050363 ("scsi: fnic: Replace sgreset tag with max_tag_id")

from the scsi-mkp tree.

I fixed it up (it was just the version number, so I used the latter) 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: pgpJaMF4HcJX4.pgp
Description: OpenPGP digital signature