On Thu, 23 Apr 2020 at 12:47, Segher Boessenkool <seg...@kernel.crashing.org> wrote: > > Hi! > > 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.
