All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: Nick Desaulniers <ndesaulniers@google.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	clang-built-linux <clang-built-linux@googlegroups.com>,
	LKML <linux-kernel@vger.kernel.org>,
	"# 3.4.x" <stable@vger.kernel.org>
Subject: Re: [PATCH] scripts: stable: add script to validate backports
Date: Thu, 25 Mar 2021 21:33:43 -0400	[thread overview]
Message-ID: <YF0594jHAlZAmIms@sashalap> (raw)
In-Reply-To: <CAKwvOd=9HwLcTD8GaMsbEWiTPfZ+fj=vgFOefqBxDYkFiv_6YQ@mail.gmail.com>

On Tue, Mar 23, 2021 at 11:52:26AM -0700, Nick Desaulniers wrote:
>On Tue, Mar 23, 2021 at 6:56 AM Greg Kroah-Hartman
><gregkh@linuxfoundation.org> wrote:
>>
>> On Tue, Mar 16, 2021 at 02:31:33PM -0700, Nick Desaulniers wrote:
>> > A common recurring mistake made when backporting patches to stable is
>> > forgetting to check for additional commits tagged with `Fixes:`. This
>> > script validates that local commits have a `commit <sha40> upstream.`
>> > line in their commit message, and whether any additional `Fixes:` shas
>> > exist in the `master` branch but were not included. It can not know
>> > about fixes yet to be discovered, or fixes sent to the mailing list but
>> > not yet in mainline.
>> >
>> > To save time, it avoids checking all of `master`, stopping early once
>> > we've reached the commit time of the earliest backport. It takes 0.5s to
>> > validate 2 patches to linux-5.4.y when master is v5.12-rc3 and 5s to
>> > validate 27 patches to linux-4.19.y. It does not recheck dependencies of
>> > found fixes; the user is expected to run this script to a fixed point.
>> > It depnds on pygit2 python library for working with git, which can be
>> > installed via:
>> > $ pip3 install pygit2
>> >
>> > It's expected to be run from a stable tree with commits applied.  For
>> > example, consider 3cce9d44321e which is a fix for f77ac2e378be. Let's
>> > say I cherry picked f77ac2e378be into linux-5.4.y but forgot
>> > 3cce9d44321e (true story). If I ran:
>> >
>> > $ ./scripts/stable/check_backports.py
>> > Checking 1 local commits for additional Fixes: in master
>> > Please consider backporting 3cce9d44321e as a fix for f77ac2e378be
>>
>> While interesting, I don't use a git tree for the stable queue, so this
>> doesn't really fit into my workflow, sorry.
>
>Well, what is your workflow?

That's a trick question :) I don't think something like this should
target our workflow, but rather should be for someone who wants to send
patches over to stable@.

I also think that the formatting patch shouldn't be checking for proper
formatting, but rather should just be doing it on it's own.

What I don't know is the right place to put it in... It can go into
stable-queue.git, but there are very few people who are aware of it's
existance, and even a smaller number who knows how it works.

-- 
Thanks,
Sasha

      parent reply	other threads:[~2021-03-26  1:34 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16 21:31 [PATCH] scripts: stable: add script to validate backports Nick Desaulniers
2021-03-23 13:50 ` Greg Kroah-Hartman
2021-03-23 18:52   ` Nick Desaulniers
2021-03-23 19:05     ` Greg Kroah-Hartman
2021-03-23 20:28       ` Nick Desaulniers
2021-03-24  9:55         ` Greg Kroah-Hartman
2021-03-26 21:03           ` Tom Saeger
2021-03-27 13:46             ` Greg Kroah-Hartman
2021-03-26  1:33     ` Sasha Levin [this message]

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=YF0594jHAlZAmIms@sashalap \
    --to=sashal@kernel.org \
    --cc=clang-built-linux@googlegroups.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ndesaulniers@google.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.