Re: Patch "drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one" has been added to the 4.9-stable tree

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Tue, May 23, 2017 at 10:04:58AM -0400, Ilia Mirkin wrote:
> On Tue, May 23, 2017 at 5:30 AM, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> > On Mon, May 22, 2017 at 07:49:50PM -0400, Ilia Mirkin wrote:
> >> On Mon, May 22, 2017 at 6:57 PM, Ilia Mirkin <imirkin@alum.mit.edu> wrote:
> >> > Hi Greg,
> >> >
> >> > This patch appears to have misapplied. I'm not sure why cherry-pick
> >> > got it wrong, but this is meant to go in the nv4a_chipset definition,
> >> > not nv44_chipset.
> >> >
> >> > This comment also applies to the 4.4 and 4.11 cherry-picks you just did.
> >>
> >> Aha, I see what happened. f94773b9f5ecd1df7c88c2e921924dd41d2020cc
> >> made it into v4.11. However by then it appears to have also made it
> >> into drm-next as ac799acaa4d8db4f7dcd968b15c9596c80a4677f and thus the
> >> drm merge into v4.12. So now you have two versions of the same commit
> >> and are trying to cherry-pick both.
> >
> > Why in the world would you include the same patch in two different trees
> > with two different git ids?  I'm _really_ starting to hate the drm
> > trees...
> 
> This question may be above my pay-grade (I'm just a lowly occasional
> contributor), but I believe the situation is that first the change
> goes into drm-next, and then is cherry-picked into drm-fixes. I
> haven't checked that this is what happened though. Nor am I
> sufficiently plugged into linux kernel development processes to know
> what the proper way to handle that situation would be, if any.
> Something to address with Ben Skeggs and Dave Airlie, I suppose.

It seems that the i915 model of putting duplicate patches in different
branches is seeping over into other drm driver trees :(

The people involved with that know my position there, it's a pain in the
ass for people like me, for reasons exactly like you are seeing here.
Thanks for helping out with this.

> >> I'm guessing it's also the reason why your cherrypick of my other
> >> commit failed (ad01a91a820cd9f0d880c407bf556b67298dcc93).
> >
> > That would make sense, but again, why is this happening?
> >
> >> And I might note that
> >> "drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch" was
> >> already there before, so didn't make it into your "4.9-stable patches"
> >> commit on the stable-queue git tree.
> >
> > Ok, so what should i do here?  Drop all of the nouveau patches?  Some of
> > them?  Which ones were wrong?
> 
> Looking at e.g.
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-4.9
> 
> I can say unequivocally that
> "drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv44-one.patch" is
> wrong in all three of your queues (4.4, 4.9, 4.11). Please drop it.

Ok, now all dropped.

thanks again for catching this and letting me know what to do,

greg k-h