From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership.com>,
Jens Axboe <axboe@kernel.dk>
Cc: Keith Busch <kbusch@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Max Gurtovoy <mgurtovoy@nvidia.com>,
Mike Christie <michael.christie@oracle.com>
Subject: linux-next: manual merge of the scsi tree with the block tree
Date: Mon, 19 Jun 2023 13:14:53 +1000 [thread overview]
Message-ID: <20230619131453.25bf2153@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1362 bytes --]
Hi all,
Today's linux-next merge of the scsi tree got a conflict in:
drivers/nvme/host/Makefile
between commit:
942e21c042e6 ("nvme: move sysfs code to a dedicated sysfs.c file")
from the block tree and commit:
b668f2f5467c ("nvme: Move pr code to it's own file")
from the scsi tree.
I fixed it up (see below) 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
diff --cc drivers/nvme/host/Makefile
index d3fc5063e4be,06c18a65da99..000000000000
--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile
@@@ -10,7 -10,7 +10,9 @@@ obj-$(CONFIG_NVME_FC) += nvme-fc.
obj-$(CONFIG_NVME_TCP) += nvme-tcp.o
obj-$(CONFIG_NVME_APPLE) += nvme-apple.o
- nvme-core-y += core.o ioctl.o sysfs.o
-nvme-core-y += core.o ioctl.o pr.o
++nvme-core-y += core.o ioctl.o
++nvme-core-y += sysfs.o
++nvme-core-y += pr.o
nvme-core-$(CONFIG_NVME_VERBOSE_ERRORS) += constants.o
nvme-core-$(CONFIG_TRACING) += trace.o
nvme-core-$(CONFIG_NVME_MULTIPATH) += multipath.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-06-19 3:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 3:14 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-07 4:09 linux-next: manual merge of the scsi tree with the block tree Stephen Rothwell
2025-01-07 6:03 ` Christoph Hellwig
2022-03-07 4:18 Stephen Rothwell
2022-03-07 4:14 Stephen Rothwell
2021-11-01 5:08 Stephen Rothwell
2021-08-24 6:32 Stephen Rothwell
2021-08-24 6:39 ` Christoph Hellwig
2020-03-25 5:04 Stephen Rothwell
2019-04-15 5:59 Stephen Rothwell
2019-04-15 13:48 ` Bart Van Assche
2019-04-17 19:11 ` Martin Wilck
2019-02-18 5:10 Stephen Rothwell
2017-06-21 5:55 Stephen Rothwell
2017-06-19 5:35 Stephen Rothwell
2016-11-08 5:48 Stephen Rothwell
2016-11-08 16:17 ` James Bottomley
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=20230619131453.25bf2153@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=axboe@kernel.dk \
--cc=kbusch@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=mgurtovoy@nvidia.com \
--cc=michael.christie@oracle.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