From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Ben Skeggs <bskeggs@redhat.com>,
"# 3.9+" <stable@vger.kernel.org>,
stable-commits@vger.kernel.org
Subject: Re: Patch "drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one" has been added to the 4.9-stable tree
Date: Tue, 23 May 2017 11:30:44 +0200 [thread overview]
Message-ID: <20170523093044.GE22923@kroah.com> (raw)
In-Reply-To: <CAKb7UviMpJ+aHGTrLJ2g77VeVbxUffh0hC9amTy68JOX8jptqA@mail.gmail.com>
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...
> 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
next prev parent reply other threads:[~2017-05-23 9:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-22 17:04 Patch "drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one" has been added to the 4.9-stable tree gregkh
2017-05-22 22:57 ` Ilia Mirkin
2017-05-22 23:49 ` Ilia Mirkin
2017-05-23 9:30 ` Greg Kroah-Hartman [this message]
2017-05-23 14:04 ` Ilia Mirkin
2017-05-23 14:20 ` Greg Kroah-Hartman
2017-06-12 13:25 ` Greg Kroah-Hartman
2017-06-12 13:38 ` Ilia Mirkin
2017-06-12 13:43 ` Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2017-04-18 12:50 gregkh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170523093044.GE22923@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=bskeggs@redhat.com \
--cc=imirkin@alum.mit.edu \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).