linux-next: manual merge of the vhost tree with the scsi tree

[Stephen Rothwell]

Hi all,

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

  drivers/scsi/virtio_scsi.c

between commit:

  92e8d0323a51 ("scsi: virtio_scsi: Remove unnecessary condition check")

from the scsi tree and commit:

  3dfd411ea7ec ("scsi: virtio_scsi: remove unnecessary condition check")

from the vhost tree.

I fixed it up (I used the former as it was a superset of 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: pgpoL63ekzUcm.pgp
Description: OpenPGP digital signature