* linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree
@ 2025-01-06 5:34 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-01-06 5:34 UTC (permalink / raw)
To: Martin K. Petersen, James Bottomley
Cc: Eric Biggers, Linux Kernel Mailing List, Linux Next Mailing List,
Manivannan Sadhasivam
[-- Attachment #1: Type: text/plain, Size: 1440 bytes --]
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,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree
@ 2021-01-18 3:45 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2021-01-18 3:45 UTC (permalink / raw)
To: Martin K. Petersen
Cc: Can Guo, Jaegeuk Kim, Linux Kernel Mailing List,
Linux Next Mailing List, James Bottomley
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
Hi all,
Today's linux-next merge of the scsi-mkp tree got a conflict in:
drivers/scsi/ufs/ufshcd.c
between commit:
4ee7ee530bc2 ("scsi: ufs: Fix livelock of ufshcd_clear_ua_wluns()")
from the scsi-fixes tree and commit:
9cd20d3f4736 ("scsi: ufs: Protect PM ops and err_handler from user access through sysfs")
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/ufs/ufshcd.c
index e324cef1fd78,9b387d6a2a25..000000000000
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6025,10 -6030,7 +6031,10 @@@ skip_err_handling
spin_unlock_irqrestore(hba->host->host_lock, flags);
ufshcd_scsi_unblock_requests(hba);
ufshcd_err_handling_unprepare(hba);
- up(&hba->eh_sem);
+ up(&hba->host_sem);
+
+ if (!err && needs_reset)
+ ufshcd_clear_ua_wluns(hba);
}
/**
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-01-06 5:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-06 5:34 linux-next: manual merge of the scsi-mkp tree with the scsi-fixes tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-01-18 3:45 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox