Re: FAILED: patch "[PATCH] x86/mm/init: Handle the special case of device private pages" failed to apply to 5.15-stable tree

[Bert Karwatzki <spasswolf@web.de>]

Am Freitag, dem 30.05.2025 um 22:08 +1000 schrieb Balbir Singh:
> On 5/30/25 21:59, Greg KH wrote:
> > On Fri, May 30, 2025 at 07:54:32PM +1000, Balbir Singh wrote:
> > > 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?
> > 
> > Did you test build it as the instructions above asked you to do?
> > 
> > Try it and see what happens :)
> 
> I stopped after cherry-pick, I thought the patch failed to apply as in cherry-pick failed :)
> So I did not try and build it. 
> 
> Balbir Singh

The member pagemap in struct mhp_params was introduced in v5.19-rc1 so the build fails
for v5.15.*.

Bert Karwatzki