From: "Maciej W. Rozycki" <macro@linux-mips.org>
To: Alan Modra <amodra@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>,
Nick Clifton <nickc@redhat.com>,
binutils@sourceware.org,
Tristan Gingold <gingold@adacore.com>,
Andrew Waterman <andrew@sifive.com>
Subject: Re: [PATCH] Add SFENCE.VMA instruction
Date: Fri, 03 Mar 2017 12:28:00 -0000 [thread overview]
Message-ID: <alpine.LFD.2.20.1703031225210.12641@eddie.linux-mips.org> (raw)
In-Reply-To: <20170216011235.GJ3731@bubble.grove.modra.org>
On Thu, 16 Feb 2017, Alan Modra wrote:
> > 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.
Or use a mailer that has a `pipe message' command even. :)
Maciej
next prev parent reply other threads:[~2017-03-03 12:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 0:55 binutils-2_28-branch: " Palmer Dabbelt
2017-02-15 0:55 ` [PATCH] " Palmer Dabbelt
2017-02-15 11:33 ` Nick Clifton
2017-02-15 18:39 ` Palmer Dabbelt
2017-02-16 1:12 ` Alan Modra
2017-03-03 12:28 ` Maciej W. Rozycki [this message]
2017-02-15 18:42 ` binutils-2_28-branch: " Palmer Dabbelt
-- strict thread matches above, loose matches on Subject: below --
2017-02-15 0:46 [PATCH] " Palmer Dabbelt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.20.1703031225210.12641@eddie.linux-mips.org \
--to=macro@linux-mips.org \
--cc=amodra@gmail.com \
--cc=andrew@sifive.com \
--cc=binutils@sourceware.org \
--cc=gingold@adacore.com \
--cc=nickc@redhat.com \
--cc=palmer@dabbelt.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).