On Thu, Apr 23, 2020 at 12:56:20PM +0100, Jonathan Wakely wrote: > On Thu, 23 Apr 2020 at 12:47, Segher Boessenkool > <seg...@kernel.crashing.org> 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
