On Tue, Jun 06, 2023 at 11:56:41AM +0200, Greg KH wrote: > On Mon, Jun 05, 2023 at 03:43:19PM -0700, Jerry Snitselaar wrote: > > On Mon, Jun 05, 2023 at 10:38:48PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > > > The patch below does not apply to the 6.3-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@xxxxxxxxxxxxxxx>. > > > > > > 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.3.y > > > git checkout FETCH_HEAD > > > git cherry-pick -x 11c439a19466e7feaccdbce148a75372fddaf4e9 > > > # <resolve conflicts, build, test, etc.> > > > git commit -s > > > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2023060548-rake-strongman-fdbe@gregkh' --subject-prefix 'PATCH 6.3.y' HEAD^.. > > > > > > Possible dependencies: > > > > > > > > > > > > thanks, > > > > > > greg k-h > > > > > > > I'm not sure what happened, but it works for me: > > I think you skipped the line above that said: > > > > # <resolve conflicts, build, test, etc.> > > Did you test-build this? > > thanks, > > greg k-h Sigh, nope skipped right over that. I even sent a reply when the original patch was sent saying it would need to be changed for stable: For the stable releases, this will need to be PAGE_MODE_4_LEVEL instead of amd_iommu_gpt_level? The 6.4 merge window is when amd_iommu_gpt_level arrived with the 5 level page table changes. Sorry for the noise.
