From: Mark Brown <broonie@kernel.org>
To: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Brian Bunker <brian@purestorage.com>,
Catalin Iacob <iacobcatalin@gmail.com>,
Krishna Kant <krishna.kant@purestorage.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree
Date: Mon, 13 Jul 2026 16:13:15 +0100 [thread overview]
Message-ID: <alUAiyS3tTHDcbPc@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1823 bytes --]
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
include/scsi/scsi_device.h
between commit:
e81f1079f9000 ("scsi: core: Remove export for scsi_device_from_queue()")
from the scsi-fixes tree and commit:
ddd0eb9bcebeb ("scsi: core: Add scsi_update_inquiry_data() for updating INQUIRY data")
from the scsi-mkp 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.
diff --cc include/scsi/scsi_device.h
index 8694eeadd753e,7c8c06e60a911..0000000000000
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@@ -408,6 -408,20 +408,19 @@@ void scsi_attach_vpd(struct scsi_devic
void scsi_cdl_check(struct scsi_device *sdev);
int scsi_cdl_enable(struct scsi_device *sdev, bool enable);
+ /**
+ * enum scsi_inq_update_result - Return values for scsi_update_inquiry_data()
+ * @SCSI_INQ_UNCHANGED: INQUIRY data updated, no reprobe needed
+ * @SCSI_INQ_REPROBE_NEEDED: INQUIRY data updated, standard INQUIRY data changed
+ */
+ enum scsi_inq_update_result {
+ SCSI_INQ_UNCHANGED = 0,
+ SCSI_INQ_REPROBE_NEEDED = 1,
+ };
+
+ int scsi_update_inquiry_data(struct scsi_device *sdev,
+ unsigned char *inq_result, size_t inq_len);
+
-extern struct scsi_device *scsi_device_from_queue(struct request_queue *q);
extern int __must_check scsi_device_get(struct scsi_device *);
extern void scsi_device_put(struct scsi_device *);
extern struct scsi_device *scsi_device_lookup(struct Scsi_Host *,
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-07-13 15:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-13 15:13 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 5:34 linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree Stephen Rothwell
2021-01-18 3:45 Stephen Rothwell
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=alUAiyS3tTHDcbPc@sirena.org.uk \
--to=broonie@kernel.org \
--cc=brian@purestorage.com \
--cc=iacobcatalin@gmail.com \
--cc=krishna.kant@purestorage.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.petersen@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