Re: FAILED: patch "[PATCH] drm/amd/display: Use HW lock mgr for PSR1 when only one eDP" failed to apply to 6.6-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Mon, Mar 24, 2025 at 08:59:49AM -0700, Greg KH wrote:
> On Mon, Mar 24, 2025 at 10:52:49AM -0500, Mario Limonciello wrote:
> > On 3/24/2025 10:37, gregkh@linuxfoundation.org wrote:
> > > 
> > > The patch below does not apply to the 6.6-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-6.6.y
> > > git checkout FETCH_HEAD
> > > git cherry-pick -x acbf16a6ae775b4db86f537448cc466288aa307e
> > > # <resolve conflicts, build, test, etc.>
> > > git commit -s
> > > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025032441-constrain-eastbound-09d8@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
> > > 
> > > Possible dependencies:
> > > 
> > > 
> > > 
> > > thanks,
> > > 
> > > greg k-h
> > > 
> > 
> > Hi,
> > 
> > Here is them missing dependency commit.  Cherry-picking this first will let
> > the fix apply cleanly on 6.6.y:
> > 
> > commit bfeefe6ea5f1 ("drm/amd/display: should support dmub hw lock on
> > Replay")
> 
> That worked, thanks!

Nope, did not work for 6.1.y, that failed there :(