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 *,