From: Sasha Levin <sashal@kernel.org>
To: Fedor Pchelkin <pchelkin@ispras.ru>
Cc: "Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
stable@vger.kernel.org,
"Alex Deucher" <alexander.deucher@amd.com>,
"Harry Wentland" <harry.wentland@amd.com>,
"Leo Li" <sunpeng.li@amd.com>,
"Rodrigo Siqueira" <Rodrigo.Siqueira@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Pan, Xinhui" <Xinhui.Pan@amd.com>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Fangzhi Zuo" <Jerry.Zuo@amd.com>,
"Wayne Lin" <wayne.lin@amd.com>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, lvc-project@linuxtesting.org,
"Alexey Khoroshilov" <khoroshilov@ispras.ru>,
"Mario Limonciello" <mario.limonciello@amd.com>,
"Jonathan Gray" <jsg@jsg.id.au>
Subject: Re: [PATCH 0/1] On DRM -> stable process
Date: Tue, 29 Oct 2024 10:20:41 -0400 [thread overview]
Message-ID: <ZyDvOdEuxYh7jK5l@sashalap> (raw)
In-Reply-To: <20241029133141.45335-1-pchelkin@ispras.ru>
On Tue, Oct 29, 2024 at 04:31:40PM +0300, Fedor Pchelkin wrote:
>BTW, a question to the stable-team: what Git magic (3-way-merge?) let the
>duplicate patch be applied successfully? The patch context in stable trees
>was different to that moment so should the duplicate have been expected to
>fail to be applied?
Just plain git... Try it yourself :)
$ git checkout 282f0a482ee6
HEAD is now at 282f0a482ee61 drm/amd/display: Skip Recompute DSC Params if no Stream on Link
$ git cherry-pick 7c887efda1
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
[detached HEAD 2a1c937960abd] drm/amd/display: Skip Recompute DSC Params if no Stream on Link
Author: Fangzhi Zuo <Jerry.Zuo@amd.com>
Date: Fri Jul 12 16:30:03 2024 -0400
1 file changed, 3 insertions(+)
$ git log -2 --oneline
2a1c937960abd (HEAD) drm/amd/display: Skip Recompute DSC Params if no Stream on Link
282f0a482ee61 drm/amd/display: Skip Recompute DSC Params if no Stream on Link
--
Thanks,
Sasha
next prev parent reply other threads:[~2024-10-29 14:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-29 13:31 [PATCH 0/1] On DRM -> stable process Fedor Pchelkin
2024-10-29 13:31 ` [PATCH 6.1 1/1] Revert "drm/amd/display: Skip Recompute DSC Params if no Stream on Link" Fedor Pchelkin
2024-10-29 14:20 ` Sasha Levin [this message]
2024-10-29 15:12 ` [PATCH 0/1] On DRM -> stable process Fedor Pchelkin
2024-11-04 14:55 ` Fedor Pchelkin
2024-11-04 15:12 ` Alex Deucher
2024-11-05 6:57 ` Greg Kroah-Hartman
2024-11-08 8:41 ` Fedor Pchelkin
2024-11-08 8:49 ` Greg Kroah-Hartman
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=ZyDvOdEuxYh7jK5l@sashalap \
--to=sashal@kernel.org \
--cc=Jerry.Zuo@amd.com \
--cc=Rodrigo.Siqueira@amd.com \
--cc=Xinhui.Pan@amd.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=harry.wentland@amd.com \
--cc=jsg@jsg.id.au \
--cc=khoroshilov@ispras.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=lvc-project@linuxtesting.org \
--cc=mario.limonciello@amd.com \
--cc=pchelkin@ispras.ru \
--cc=stable@vger.kernel.org \
--cc=sunpeng.li@amd.com \
--cc=wayne.lin@amd.com \
/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