Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: drivers/ufs/core/ufshcd.c between commit: 6da1bc55c060b ("scsi: ufs: core: Keep clock-gating hold on failed W-LUN runtime resume") from the scsi-fixes tree and commit: 7693e76c9f8b7 ("scsi: ufs: core: Limit early link recovery in the error handler to runtime PM") 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 drivers/ufs/core/ufshcd.c index c9b2eefbd7b0b,56a77f4a2a6ef..0000000000000 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@@ -10659,15 -10678,9 +10694,15 @@@ vendor_suspend out: if (ret) ufshcd_update_evt_hist(hba, UFS_EVT_WL_RES_ERR, (u32)ret); - hba->clk_gating.is_suspended = false; - ufshcd_release(hba); + /* + * A failed runtime resume leaves the W-LUN RPM_SUSPENDED, so keep + * is_suspended and the suspend hold for the next resume. + */ + if (!ret || pm_op != UFS_RUNTIME_PM) { + hba->clk_gating.is_suspended = false; + ufshcd_release(hba); + } - hba->pm_op_in_progress = false; + WRITE_ONCE(hba->pm_op_in_progress, false); return ret; }