Subject: linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 6 Jan 2025 16:34:12 +1100

Hi all,

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

  drivers/ufs/host/ufs-qcom.c

between commit:

  7bac65687510 ("scsi: ufs: qcom: Power off the PHY if it was already powered on in ufs_qcom_power_up_sequence()")

from the scsi-fixes tree and commit:

  30b32c647cf3 ("scsi: ufs: qcom: Convert to use UFSHCD_QUIRK_CUSTOM_CRYPTO_PROFILE")

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/ufs/host/ufs-qcom.c
index 91e94fe990b4,eae8dfb8c91e..000000000000
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@@ -1826,7 -1876,7 +1878,6 @@@ static const struct ufs_hba_variant_op
  	.dbg_register_dump	= ufs_qcom_dump_dbg_regs,
  	.device_reset		= ufs_qcom_device_reset,
  	.config_scaling_param = ufs_qcom_config_scaling_param,
- 	.program_key		= ufs_qcom_ice_program_key,
 -	.reinit_notify		= ufs_qcom_reinit_notify,
  	.mcq_config_resource	= ufs_qcom_mcq_config_resource,
  	.get_hba_mac		= ufs_qcom_get_hba_mac,
  	.op_runtime_config	= ufs_qcom_op_runtime_config,