From: Jani Nikula <jani.nikula@linux.intel.com>
To: Daniel Vetter <daniel@ffwll.ch>, Greg KH <gregkh@linuxfoundation.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
intel-gfx <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
stable <stable@vger.kernel.org>
Subject: Re: [Intel-gfx] The i915 stable patch marking is totally broken
Date: Mon, 13 Mar 2017 12:41:39 +0200 [thread overview]
Message-ID: <87a88pfogs.fsf@intel.com> (raw)
In-Reply-To: <CAKMK7uGStXcZXWqHJtH6jM5uy40Wo8pA7S8iHOFScTkCSM4A7Q@mail.gmail.com>
On Mon, 13 Mar 2017, Daniel Vetter <daniel@ffwll.ch> wrote:
> Our cherry-pick sha1 work exactly like yours: They don't make sense
> when you only look at the tree a patch has been cherry-picked _to_,
> since they're the sha1 from the tree they've been cherry-picked
> _from_. When you clone a fresh copy of your stable tree then the
> cherry-pick numbers also point nowhere. Only once you've pulled the
> future tree they're from (Linus' git in your case) do they make sense.
>
> Same for our cherry-picks, except the future tree isn't Linus' git
> (we'd have managed to make sha1 collisions cheaply otherwise ...) but
> the future Linus' git tree. Which is maintained by Stephen Rothwell in
> linux-next. As soon as you make sure you have the latest
> linux-next.git they will all resolve to something meaningful.
Indeed, if there's a cherry-pick reference to a commit that's *not* in
linux-next, we deserve to be yelled at. The branches that feed to
linux-next that we cherry-pick from are non-rebasing, so the commit ids
should not change when they eventually hit Linus' tree.
>> So if a commit says "cherry-pick", I guess I can always assume it's safe
>> to add, right? If not, _then_ I have to run the "search backwards"
>> logic, right?
>>
>> Ok, let me think about this a bit to see if that's possible to script...
Most of our cherry-picking is scripted, so if there's further annotation
that you'd like, just let us know. (Too bad it's virtually impossible to
modify the commit being cherry-picked. Unless someone(tm) comes up with
a way to share git-notes in a sensible, distributed way.)
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
next prev parent reply other threads:[~2017-03-13 10:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-12 19:44 The i915 stable patch marking is totally broken Greg KH
2017-03-12 20:11 ` Dave Airlie
2017-03-12 21:52 ` Greg KH
2017-03-13 6:49 ` [Intel-gfx] " Daniel Vetter
2017-04-12 12:48 ` Greg KH
2017-04-12 12:57 ` Greg KH
2017-03-12 20:46 ` Daniel Vetter
2017-03-12 22:01 ` Greg KH
2017-03-13 6:40 ` Daniel Vetter
2017-03-13 10:41 ` Jani Nikula [this message]
2017-03-16 7:38 ` Daniel Vetter
2017-03-16 14:02 ` Greg KH
2017-03-16 14:40 ` Jani Nikula
2017-03-17 1:21 ` Greg KH
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=87a88pfogs.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=daniel.vetter@intel.com \
--cc=daniel@ffwll.ch \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@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).