[COMMITTED] ja_JP: Change the offset for Taisho gan-nen from 2 to 1 [BZ #24162]

[Rafal Luzynski]

22.03.2019 04:40 TAMUKI Shoichi <tamuki@linet.gr.jp> wrote:
> 
> Hello Rafal-san,
> 
> From: Rafal Luzynski <digitalfreak@lingonborough.com>
> Subject: Re: [COMMITTED] ja_JP: Change the offset for Taisho gan-nen from
> 2 to 1 [BZ #24162]
> Date: Wed, 20 Mar 2019 23:08:23 +0100 (CET)
> 
> > > Yes, I remember the work remaining to backport this patch to 2.29.
> > 
> > OK, nice.
> 
> I have done git push to 2.29 branch.
> 
> https://sourceware.org/bugzilla/show_bug.cgi?id=24162#c10
> [...]

LGTM, thank you.

> [...]
> * Note to self: Steps to backport from master to 2.29
> 
> git fetch origin release/2.29/master
> git checkout release/2.29/master
> git cherry-pick -x 31effac
> cat << "EOF" | patch ChangeLog
> 1,3d0
> < <<<<<<< HEAD
> < 2019-03-21  Stefan Liebler  <stli@linux.ibm.com>
> < =======
> 10,11c7
> < 2019-03-01  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
> < >>>>>>> 31effacee2... ja_JP: Change the offset for Taisho gan-nen from 2
> to 1 [BZ #24162]
> ---
> > 2019-03-21  Stefan Liebler  <stli@linux.ibm.com>
> EOF
> git add ChangeLog
> git cherry-pick --continue
> git push origin release/2.29/master

Looks good.  You forgot about two important things:

1. git format-patch HEAD^..HEAD

and then send the output to libc-stable@sourceware.org with the subject
line starting with "[COMMITTED 2.29]"

2. git checkout master

for your own security, to make sure you don't push future commits to
2.29 accidentally.

Regards,

Rafal