[PATCH] Add SFENCE.VMA instruction
Alan Modra
amodra@gmail.com
Thu Feb 16 01:12:00 GMT 2017
On Wed, Feb 15, 2017 at 10:39:23AM -0800, Palmer Dabbelt wrote:
> On Wed, 15 Feb 2017 03:33:40 PST (-0800), nickc@redhat.com wrote:
> > Note - it is customary to include ChangeLog entries as plain text rather
> > than context diffs. This is because the changelogs change so rapidly that
> > it is often not possible to apply a patch cleanly if they contain changelog
> > diffs.
>
> I've been using "git-merge-changelog" to merge my ChangeLog entries and haven't
> had a merge conflict yet.
Good point. I've been wondering about a change to our policy about
ChangeLog diffs for a while. With git and git-merge-changelog it is
actually *less* work for a maintainer to apply a patch if the diff
includes the ChangeLog. You just save the email to a temporary empty
mailbox somewhere, then "git am <mailbox>" plus perhaps a little
editing of the commit message and adding generated files.
--
Alan Modra
Australia Development Lab, IBM
More information about the Binutils
mailing list