linux-next: manual merge of the scsi-mkp tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the scsi-mkp tree got conflicts in:

  drivers/scsi/mpt3sas/mpt3sas_base.c
  drivers/scsi/mpt3sas/mpt3sas_base.h

between commit:

  fae21608c31c ("scsi: mpt3sas: Transition IOC to Ready state during shutdown")

from Linus' tree and commit:

  432bc7caef4e ("scsi: mpt3sas: Add io_uring iopoll support")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/scsi/mpt3sas/mpt3sas_base.c
index cf4a3a2c22ad,e7f6fbb282bd..000000000000
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@@ -8471,7 -8738,8 +8738,8 @@@ mpt3sas_base_hard_reset_handler(struct 
  	_base_pre_reset_handler(ioc);
  	mpt3sas_wait_for_commands_to_complete(ioc);
  	mpt3sas_base_mask_interrupts(ioc);
+ 	mpt3sas_base_pause_mq_polling(ioc);
 -	r = _base_make_ioc_ready(ioc, type);
 +	r = mpt3sas_base_make_ioc_ready(ioc, type);
  	if (r)
  		goto out;
  	_base_clear_outstanding_commands(ioc);
diff --cc drivers/scsi/mpt3sas/mpt3sas_base.h
index 0c6c3df0038d,3cf2e4615ff5..000000000000
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
@@@ -1730,10 -1755,9 +1755,13 @@@ do {	ioc_err(ioc, "In func: %s\n", __fu
  	status, mpi_request, sz); } while (0)
  
  int mpt3sas_wait_for_ioc(struct MPT3SAS_ADAPTER *ioc, int wait_count);
 +int
 +mpt3sas_base_make_ioc_ready(struct MPT3SAS_ADAPTER *ioc, enum reset_type type);
 +void mpt3sas_base_free_irq(struct MPT3SAS_ADAPTER *ioc);
 +void mpt3sas_base_disable_msix(struct MPT3SAS_ADAPTER *ioc);
+ int mpt3sas_blk_mq_poll(struct Scsi_Host *shost, unsigned int queue_num);
+ void mpt3sas_base_pause_mq_polling(struct MPT3SAS_ADAPTER *ioc);
+ void mpt3sas_base_resume_mq_polling(struct MPT3SAS_ADAPTER *ioc);
  
  /* scsih shared API */
  struct scsi_cmnd *mpt3sas_scsih_scsi_lookup_get(struct MPT3SAS_ADAPTER *ioc,

Attachment: pgpYk3n2t43cn.pgp
Description: OpenPGP digital signature