* linux-next: manual merge of the vhost tree with the scsi tree
@ 2020-08-04 5:06 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2020-08-04 5:06 UTC (permalink / raw)
To: Michael S. Tsirkin, James Bottomley
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Xianting Tian, Martin K. Petersen
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-04 5:06 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 5:06 linux-next: manual merge of the vhost tree with the scsi tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®