Hi! On Mon, May 18, 2020 at 11:54:31AM -0700, Joel Brobecker wrote: > > (Don't forget the changelog?) > > Thank you, Segher. Pushed to master, and for 8, 9 and 10.
Thanks! > I did include the ChangeLog indeed. I tend to avoid sending them > in the diff, because they usually don't apply out of the box. I know > there are some ways to resolve the conflicts automatically. I haven't > gotten around to setting that up, but if this is causing any confusion > here, I'll make sure to include the ChangeLog diff in the patch as well. Well, you *never* should have had the changelog as part of the patch... This has been the policy since forever. The usual place to put it was as text between your introductory message and the patch. With the new changelog policies that still holds: you no longer will patch and check in the changelog files, but you will put the changelog at the end of your commit message, and the rest is magic. If I understand it all correctly :-) We'll hear details soon enough I bet :-) Segher
