From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>,
James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Xianting Tian <xianting_tian@126.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>
Subject: linux-next: manual merge of the vhost tree with the scsi tree
Date: Tue, 4 Aug 2020 15:06:22 +1000 [thread overview]
Message-ID: <20200804150622.72067466@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2020-08-04 5:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200804150622.72067466@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mst@redhat.com \
--cc=xianting_tian@126.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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®