From: Balbir Singh <balbirs@nvidia.com>
To: gregkh@linuxfoundation.org, airlied@gmail.com,
akpm@linux-foundation.org, alexander.deucher@amd.com,
brgerst@gmail.com, christian.koenig@amd.com, hch@lst.de,
hpa@zytor.com, jgross@suse.com, mingo@kernel.org,
pierre-eric.pelloux-prayer@amd.com, simona@ffwll.ch,
spasswolf@web.de, torvalds@linux-foundation.org
Cc: stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] x86/mm/init: Handle the special case of device private pages" failed to apply to 5.15-stable tree
Date: Fri, 30 May 2025 19:54:32 +1000 [thread overview]
Message-ID: <300d265c-ff6c-4e01-a841-e8925e5d6d3b@nvidia.com> (raw)
In-Reply-To: <0c1d51d3-7f25-4a7e-b97e-dc2177d6bfb6@nvidia.com>
On 5/28/25 08:59, Balbir Singh wrote:
> On 5/28/25 02:55, 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 7170130e4c72ce0caa0cb42a1627c635cc262821
>> # <resolve conflicts, build, test, etc.>
>> git commit -s
>> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2025052750-fondness-revocable-a23b@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
>>
>> Possible dependencies:
>>
>>
>
> We only need it if 7ffb791423c7 gets backported. I can take a look and see if we need the patch and why the application of the patch failed
>
> Balbir
>
Hi, Greg
FYI: I was able to cherry pick 7170130e4c72ce0caa0cb42a1627c635cc262821 on top of
5.15.y (5.15.184) on my machine
I ran the steps below
>> 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 7170130e4c72ce0caa0cb42a1627c635cc262821
I saw no conflicts. Am I missing something?
Balbir
next prev parent reply other threads:[~2025-05-30 9:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-27 16:55 FAILED: patch "[PATCH] x86/mm/init: Handle the special case of device private pages" failed to apply to 5.15-stable tree gregkh
2025-05-27 22:59 ` Balbir Singh
2025-05-30 9:54 ` Balbir Singh [this message]
2025-05-30 11:59 ` Greg KH
2025-05-30 12:08 ` Balbir Singh
2025-05-30 18:09 ` Bert Karwatzki
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=300d265c-ff6c-4e01-a841-e8925e5d6d3b@nvidia.com \
--to=balbirs@nvidia.com \
--cc=airlied@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.deucher@amd.com \
--cc=brgerst@gmail.com \
--cc=christian.koenig@amd.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=mingo@kernel.org \
--cc=pierre-eric.pelloux-prayer@amd.com \
--cc=simona@ffwll.ch \
--cc=spasswolf@web.de \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.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