From: Mario Limonciello <mario.limonciello@amd.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: alex.hung@amd.com, alexander.deucher@amd.com,
chiahsuan.chung@amd.com, daniel.wheeler@amd.com,
stable@vger.kernel.org
Subject: 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
Date: Mon, 24 Mar 2025 11:23:39 -0500 [thread overview]
Message-ID: <18f1de8d-3fd6-40d3-9458-a0d71241d40b@amd.com> (raw)
In-Reply-To: <2025032408-keep-amplifier-ec1e@gregkh>
On 3/24/2025 11:21, Greg KH wrote:
> 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 :(
>
Yeah I saw both failure emails. This was only for 6.6.y that it works.
For 6.1.y here is a backport.
https://lore.kernel.org/stable/20250324155629.2588451-1-superm1@kernel.org/T/#u
prev parent reply other threads:[~2025-03-24 16:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 15:37 FAILED: patch "[PATCH] drm/amd/display: Use HW lock mgr for PSR1 when only one eDP" failed to apply to 6.6-stable tree gregkh
2025-03-24 15:52 ` Mario Limonciello
2025-03-24 15:59 ` Greg KH
2025-03-24 16:21 ` Greg KH
2025-03-24 16:23 ` Mario Limonciello [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=18f1de8d-3fd6-40d3-9458-a0d71241d40b@amd.com \
--to=mario.limonciello@amd.com \
--cc=alex.hung@amd.com \
--cc=alexander.deucher@amd.com \
--cc=chiahsuan.chung@amd.com \
--cc=daniel.wheeler@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox