From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail3-relais-sop.national.inria.fr (mail3-relais-sop.national.inria.fr [192.134.164.104]) by sourceware.org (Postfix) with ESMTPS id D9F613857C73 for ; Tue, 17 Nov 2020 08:27:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D9F613857C73 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=inria.fr Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Paul.Zimmermann@inria.fr X-IronPort-AV: E=Sophos;i="5.77,485,1596492000"; d="scan'208";a="364758606" Received: from tomate.loria.fr (HELO tomate) ([152.81.10.51]) by mail3-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Nov 2020 09:27:46 +0100 Date: Tue, 17 Nov 2020 09:27:46 +0100 Message-Id: From: Paul Zimmermann To: Shuo Wang CC: libc-alpha@sourceware.org, carlos@redhat.com, hushiyuan@huawei.com In-reply-to: <20201117014115.24140-1-wangshuo47@huawei.com> (message from Shuo Wang on Tue, 17 Nov 2020 09:41:15 +0800) Subject: Re: [PATCH] Fix typo in NEWS file References: <20201117014115.24140-1-wangshuo47@huawei.com> X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2020 08:27:55 -0000 Dear Shuo, this patch is fine with me, thank you! Paul > From: Shuo Wang > CC: , > 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 > Cc: wangshuo (AF) > 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