From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) by sourceware.org (Postfix) with ESMTP id 0137C385DC0B; Thu, 23 Apr 2020 12:30:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0137C385DC0B Received: from gate.crashing.org (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.14.1) with ESMTP id 03NCUCKL007752; Thu, 23 Apr 2020 07:30:12 -0500 Received: (from segher@localhost) by gate.crashing.org (8.14.1/8.14.1/Submit) id 03NCUA8S007751; Thu, 23 Apr 2020 07:30:10 -0500 X-Authentication-Warning: gate.crashing.org: segher set sender to segher@kernel.crashing.org using -f Date: Thu, 23 Apr 2020 07:30:10 -0500 From: Segher Boessenkool To: Jonathan Wakely Cc: Tamar Christina , "overseers@gcc.gnu.org" , Jonathan Wakely via Gcc , Overseers mailing list , Alexander Monakov , "Frank Ch. Eigler" , "Frank Ch. Eigler" , Florian Weimer , Tom Tromey Subject: Re: Not usable email content encoding Message-ID: <20200423123010.GK26902@gate.crashing.org> References: <87zhccsdfd.fsf@tromey.com> <87imj0pjbr.fsf@mid.deneb.enyo.de> <87blosphsw.fsf@mid.deneb.enyo.de> <20200423114627.GG26902@gate.crashing.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, TXREP, T_SPF_HELO_PERMERROR, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: overseers@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Overseers mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Apr 2020 12:30:20 -0000 On Thu, Apr 23, 2020 at 12:56:20PM +0100, Jonathan Wakely wrote: > On Thu, 23 Apr 2020 at 12:47, Segher Boessenkool > wrote: > > On Thu, Apr 23, 2020 at 12:54:04AM +0000, Tamar Christina wrote: > > > but trains for GCC Will likely be very short because of Changelog conflicts. > > > > Why that? Your patches should *not* touch changelog files, ever. > > > > For CI it is probably easiest if the CI never gets to see the changelog > > at all, and that isn't hard to do ;-) > > For the actual CI testing, yes. But if you want an automated "merge > after CI testing passes" then what you merge needs to add a ChangeLog > entry. So either we auto-generate the entry when doing the auto-merge, > or the ChangeLog entry is already there. Why would we make it part of the patch for that? That is backwards :-) If it isn't part of the patch, no matter how we do it I don't see how it would cause conflicts? Segher