On Tue, Jul 11, 2017 at 11:56:08AM +0100, Maciej W. Rozycki wrote:
> On Tue, 11 Jul 2017, James Hogan wrote:
>
> > On Sat, Jul 08, 2017 at 11:24:44PM +0100, Maciej W. Rozycki wrote:
> > > Cc: stable@xxxxxxxxxxxxxxx # 3.19+
> > > Fixes: 515a6393dbac ("MIPS: kernel: proc: Add MIPS R6 support to /proc/cpuinfo")
> >
> > That commit landed in v4.0-rc1, not 3.19.
>
> Hmm:
>
> $ git show 515a6393dbac:Makefile | head -5
> VERSION = 3
> PATCHLEVEL = 19
> SUBLEVEL = 0
> EXTRAVERSION = -rc4
> NAME = Diseased Newt
> $
>
> I just trusted that.
Yeh, thats the release its based on, not the release it was first merged
into, usually the subsystem branch for the next release is based on one
of the rc's of the previous release.
I have this slow hack in my ~/.gitconfig:
[alias]
tc = tag --contains
vc = "!vc() { for i in `git tc \"$@\" | grep '^v'`; do echo \"$(git log -1 --pretty='%ct' $i) $i\"; done | sort -n | head -n1 | sed 's/^[0-9]* //g'; }; vc"
Then:
$ git vc 515a6393dbac4f4492237c7b305bbf9c4c558a1c
v4.0-rc1
You can do something sort of similar with git describe --contains:
$ git describe --contains 515a6393dbac4f4492237c7b305bbf9c4c558a1c
v4.0-rc1~4^2~26^2~34
But if you have other tags in your tree between the commit and an
upstream release it'll sometimes show that instead which isn't very
helpful.
>
> > Most stable tags with comments also have square brackets around the
> > email too, i.e.:
> > Cc: <stable@xxxxxxxxxxxxxxx> # 4.0+
> >
> > (though maybe thats just not to confuse git-send-email).
>
> It doesn't seem so obvious, it looks fairly random to me. If you say
> it helps, then I can adjust -- any pointers to a previous discussion?
No idea, just a random observation.
Documentation/process/stable-kernel-rules.rst uses <>, but also has a
weird version comment format more like below which I'm not too keen on:
Cc: <stable@xxxxxxxxxxxxxxx> # 4.0.y-
Cheers
James
>
> > Otherwise:
> > Reviewed-by: James Hogan <james.hogan@xxxxxxxxxx>
> >
> > Nice catch!
>
> Thanks for your review. I actually spotted it visually in the course
> of the recent Octeon ISA level discussion, before verifying the fix with
> actual hardware.
>
> Maciej
Attachment:
signature.asc
Description: Digital signature
