Re: Determining corresponding mainline patch for stable patches Re: [PATCH 5.10 125/135] drm/i915: avoid uninitialised var in eb_parse()

On Fri, Aug 13, 2021 at 12:24:29PM +0200, Pavel Machek wrote:

On Fri 2021-08-13 11:54:29, Willy Tarreau wrote:

quoted

Hi Pavel,

On Fri, Aug 13, 2021 at 11:31:04AM +0200, Pavel Machek wrote:

quoted

quoted

quoted

If we could agree on

Commit: (SHA)

in the beggining of body, that would be great.

Upstream: (SHA)

in sign-off area would be even better.

What exactly are you trying to do when you find a sha1?  For some reason
my scripts work just fine with a semi-free-form way that we currently
have been doing this for the past 17+ years.  What are you attempting to
do that requires such a fixed format?

Is there any problem having a fixed format? You are producing -stable
kernels, so you are not the one needing such functionality.

When I was doing extended LTS in the past, I used to restart from
Greg's closest branch (e.g. 4.4.y for latest 3.10.y) and needed
exactly that. It was pretty easy in the end, as you'll essentially
find two formats (one form from net and the other for the rest of
the patches):

  - commit XXXX upstream
  - [ Upstream commit XXXX ]

I ended up writing this trivial script that did the job well for me
and also supported the "git cherry-pick -x" format that I was using
a lot. Feel free to reuse that as a starting point, here it comes, a
bit covered in dust :-)

Please see previous discussion. Yes, I have my regexps, too, but there
are variations, and there were even false positives.. One of them is
in this email thread.

Greg suggests to simply ignore context and look for SHA1 sum; that
does not work, either.

The number of patches that your regex does not work on is a very tiny %,
right?  Can't you just handle those "by hand"?

So what I'm asking is for single, easy to parse format. I don't quite
care what it is, but

As long as people end up sending us patches as backports, they will get
the format wrong in odd ways over time.  Heck, we can't even all get a
simple signed-off-by: right all the time, look at the kernel logs for
loads of issues where long-time developers mess that one up.

The phrase "perfect is the enemy of good" or something like that applies
here.  I'm giving you backported patches "for free", the number of ones
that someone messes up the text on is so small it should be lost in the
noise...

thanks,

greg k-h