Re: [PATCH] Fix typo in NEWS file

[Paul Zimmermann <Paul.Zimmermann@inria.fr>]

       Dear Shuo,

I hope they will. However I have technical difficulties committing them
(I am new to the patchwork process). Hopefully I will be able to solve
that with Carlos' help.

Paul

> From: Shuo Wang <wangshuo47@huawei.com>
> Date: Sat, 28 Nov 2020 09:54:16 +0800
> 
> 	Dear Paul,
> 
> Thanks for your reply. I was wondering if these two changes 
> will be merged in the future?
> 
> Best regards,
> Shuo
> 
> > 
> >        Dear Shuo,
> > 
> > this patch is fine with me, thank you!
> > 
> > Paul
> > 
> > > From: Shuo Wang <wangshuo47@huawei.com>
> > > CC: <carlos@redhat.com>, <hushiyuan@huawei.com>
> > > Date: Tue, 17 Nov 2020 09:41:15 +0800
> > > 
> > > 	Dear Paul,
> > > 
> > > This mail may work
> > > 
> > > Thank you,
> > > Shuo
> > > 
> > > Fix typo in NEWS file
> > > ---
> > >   NEWS | 4 ++--
> > >   1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/NEWS b/NEWS
> > > index 0335fb98e5..f2acc53790 100644
> > > --- a/NEWS
> > > +++ b/NEWS
> > > @@ -732,7 +732,7 @@ The following bugs are resolved with this release:
> > >    [24040] libc: riscv64: unterminated call chain in __thread_start
> > >    [24047] network: libresolv should use IP_RECVERR/IPV6_RECVERR to avoid
> > >      long timeouts
> > > -  [24051] stdio: puts and putchar ouput to _IO_stdout instead of stdout
> > > +  [24051] stdio: puts and putchar output to _IO_stdout instead of stdout
> > >    [24059] nss: nss_files: get_next_alias calls fgets_unlocked without
> > >      checking for NULL.
> > >    [24114] regex: regexec buffer read overrun in "grep -i
> > > @@ -1910,7 +1910,7 @@ The following bugs are resolved with this release:
> > >    [22111] malloc: malloc: per thread cache is not returned when thread exits
> > >    [22112] localedata: Fix LC_TELEPHONE/LC_NAME for az_AZ
> > >    [22134] libc: [linux] implement fexecve with execveat
> > > -  [22142] libc: [powerpc] printf oupts a wrong value of DBL_MAX on ppc64 and
> > > +  [22142] libc: [powerpc] printf outputs a wrong value of DBL_MAX on ppc64 and
> > >      ppc64le
> > >    [22145] libc: ttyname() gives up too early in the face of namespaces
> > >    [22146] math: C++ build issue with float128 on x86_64
> > > -- 
> > > 2.23.0
> > > 
> > > Fix typo in NEWS file
> > > ---
> > >   NEWS | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/NEWS b/NEWS
> > > index 0335fb98e5..23ab38e447 100644
> > > --- a/NEWS
> > > +++ b/NEWS
> > > @@ -2693,7 +2693,7 @@ Security related changes:
> > >  
> > >  The following bugs are resolved with this release:
> > >  
> > > -  [4099] stdio: Overly agressive caching by stream i/o functions.
> > > +  [4099] stdio: Overly aggressive caching by stream i/o functions.
> > >    [7065] build: Support building glibc with -fstack-protector or -fstack-
> > >      protector-all
> > >    [9842] localedata: en_CA: incorrect date format
> > > -- 
> > > 2.23.0
> > > 
> > > 
> > > 
> > > -----Original Message-----
> > > From: Paul Zimmermann [mailto:Paul.Zimmermann@inria.fr] 
> > > Sent: Monday, November 16, 2020 6:04 PM
> > > To: Carlos O'Donell <carlos@redhat.com>
> > > Cc: wangshuo (AF) <wangshuo47@huawei.com>
> > > Subject: Re: [PATCH] Fix typo in NEWS file
> > > > 
> > > >        Dear Carlos,
> > > > 
> > > > thank you for your help. I tried to apply the first patch from Shuo Wang
> > > > (40940):
> > > > 
> > > > > 1. In Patchwork you would mark the bug "Accepted" and delegate to "zimmerma".
> > > > 
> > > > done
> > > > 
> > > > > 2. Use git pw patch apply XXXX to apply the patch to the tree
> > > > 
> > > > this step failed:
> > > > 
> > > > zimmerma@mure:~/svn/glibc$ git-pw patch apply 40940
> > > > /home/zimmerma/anaconda2/lib/python2.7/site-packages/arrow/arrow.py:28: DeprecationWarning: Arrow will drop support for Python 2.7 and 3.5 in the upcoming v1.0.0 release. Please upgrade to Python 3.6+ to continue receiving updates for Arrow.
> > > >   DeprecationWarning,
> > > > Applying: Fix typo in NEWS file
> > > > fatal: corrupt patch at line 24
> > > > error: could not build fake ancestor
> > > > Patch failed at 0001 Fix typo in NEWS file
> > > > The copy of the patch that failed is found in: .git/rebase-apply/patch
> > > > When you have resolved this problem, run "git am --continue".
> > > > If you prefer to skip this patch, run "git am --skip" instead.
> > > > To restore the original branch and stop patching, run "git am --abort".
> > > > 
> > > > Line 24 is the middle line below (I don't know why "exits" is not on the
> > > > same line as the above one):
> > > > 
> > > >     [22111] malloc: malloc: per thread cache is not returned when thread
> > > > exits
> > > >     [22112] localedata: Fix LC_TELEPHONE/LC_NAME for az_AZ
> > > > 
> > > > Best regards,
> > > > Paul