Re: FAILED: patch "[PATCH] scsi: ufs: ufs-pci: Fix default runtime and system PM levels" failed to apply to 5.15-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Fri, Aug 22, 2025 at 08:10:39AM +0300, Adrian Hunter wrote:
> On 21/08/2025 16:09, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 5.15-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> > 
> > To reproduce the conflict and resubmit, you may use the following commands:
> > 
> > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 6de7435e6b81fe52c0ab4c7e181f6b5decd18eb1
> 
> This works for me even though ufshcd-pci.c has moved since then
> from drivers/scsi/ufs/ to drivers/ufs/host/
> 
>   $ git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
>   From https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux
>    * branch                      linux-5.15.y -> FETCH_HEAD
>   $ git checkout FETCH_HEAD
>   HEAD is now at c79648372d02 Linux 5.15.189
>   $ git show --stat 6de7435e6b81fe52c0ab4c7e181f6b5decd18eb1 | grep ufshcd-pci.c
>    drivers/ufs/host/ufshcd-pci.c | 15 ++++++++++++++-
>   $ git cherry-pick -x 6de7435e6b81fe52c0ab4c7e181f6b5decd18eb1
>   Auto-merging drivers/scsi/ufs/ufshcd-pci.c
>   [detached HEAD 15aa885c945e] scsi: ufs: ufs-pci: Fix default runtime and system PM levels
>    Date: Wed Jul 23 19:58:50 2025 +0300
>    1 file changed, 14 insertions(+), 1 deletion(-)
>   $ git show --stat HEAD | grep ufshcd-pci.c
>    drivers/scsi/ufs/ufshcd-pci.c | 15 ++++++++++++++-
> 
> Please note 4428ddea832cfdb63e476eb2e5c8feb5d36057fe works too:
> 
>   $ git cherry-pick -x 4428ddea832cfdb63e476eb2e5c8feb5d36057fe
>   Auto-merging drivers/scsi/ufs/ufshcd-pci.c
>   [detached HEAD 9b324ade6f64] scsi: ufs: ufs-pci: Fix hibernate state transition for Intel MTL-like host controllers
>    Author: Archana Patni <archana.patni@intel.com>
>    Date: Wed Jul 23 19:58:49 2025 +0300
>    1 file changed, 27 insertions(+)

I don't use cherry-pick, so if a file moves it's hard to detect at
times.  Can you send me the patch that you have properly generated (and
built-tested)?

thanks,

greg k-h