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@xxxxxxxxxxxx> 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... > 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? totally confused and grumpy, greg k-h