Shared Code Changes for the RISC-V Glibc Port

[Palmer Dabbelt]

On Sat, 06 Jan 2018 09:54:26 PST (-0800), aurelien@aurel32.net wrote:
> On 2018-01-06 10:02, Zack Weinberg wrote:
>> On Sat, Jan 6, 2018 at 2:32 AM, Palmer Dabbelt <palmer@dabbelt.com> wrote:
>> > Sorry this took a while to get to, but things got a bit busy here when everyone
>> > came back from vacation.  I believe I've managed to pull out all the shared
>> > changes and addresses the feedback to them from our v3 submission.  I've
>> > included ChangeLog entries for all of them, which I wouldn't usually do but I'm
>> > doing here just to make sure they're OK -- I managed to screw the ChangeLog
>> > entries up a handful of times in binutils and GCC, so I figure because it's a
>> > slightly different set of people here it's worth sending them out as part of
>> > the patches.
>>
>> We (glibc reviewers) want to see ChangeLog entries with every patch
>> submission (as part of the commit message, *not* as modifications to
>> the actual ChangeLog file, which inevitably cause merge conflicts).
>
> In practice the merge conflicts are handled automatically if
> git-merge-changelog is installed on your system. That said it doesn't
> prevent having the entries in both the ChangeLog file and the commit
> message.

I used that for a while in binutils land, but people seemed happier with the 
entries in the commit log.  I've gotten used to the commit log way, so I don't 
mind doing it (it's just an extra step).