On Tue, Jun 17, 2025 at 03:05:10PM +0200, Danilo Krummrich wrote: > On Tue, Jun 17, 2025 at 01:29:20PM +0200, Philipp Stanner wrote: > > On Tue, 2025-06-17 at 14:00 +1000, Ben Skeggs wrote: > > > diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c > > > b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c > > > index baf42339f93e..b098a7555fde 100644 > > > --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c > > > +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c > > > > This seems to be based on a code move that is not yet in mainline. > > It is, it did land with v6.16-rc1. > > > Therefore, backporting the bugfix to stable seems difficult. Since that > > code move is already in drm-misc-next, it would seem that it can only > > be solved with two distinct patches for stable and for -next. > > drm-misc-fixes is the relevant target branch and given the above, it contains > the code move as well. > > However, you're right that this fix won't apply to anything before v6.16-rc1. > Given that, it makes sense to leave a note below the '---' line that this fix > won't apply before v6.16-rc1 and that a backported patch will be sent to > stable > once this one hit Linus' tree.
Nevermind, I think this file wasn't split up and is correctly considered as moved by git, so I think the patch should apply as is.
