From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, James Morris <jmorris@namei.org>,
simo@redhat.com, zohar@linux.vnet.ibm.com,
keyrings@linux-nfs.org, linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] Keyrings patches
Date: Wed, 18 Sep 2013 12:53:06 +0100 [thread overview]
Message-ID: <1320.1379505186@warthog.procyon.org.uk> (raw)
In-Reply-To: <20130918115000.b78a5e79d65aa23ced0ac8e4@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Is there some reason that those fixups cannot be done in a merge commit?
> i.e. are they more than simple text updates?
That's somewhat up to James. *He* would be the person doing the merge, not
me. I'm changing the lines in my patches also.
> /me thinks that most rebases people do can be better done (and
> documented) as merges.
That depends on how you define "better". Better for what? I think it's
better to absorb the changes into my patch series. StGIT is very good for
handling this, since my patches are currently maintained as an StGIT set.
That way, there ends up one fewer commit in the history, assuming no other
collisions with what James merges.
David
next prev parent reply other threads:[~2013-09-18 11:53 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-05 0:14 [GIT PULL] Keyrings patches David Howells
2013-09-06 17:10 ` James Morris
2013-09-06 17:36 ` David Howells
2013-09-07 4:26 ` James Morris
2013-09-10 9:45 ` David Howells
2013-09-11 15:41 ` James Morris
2013-09-17 13:55 ` David Howells
2013-09-18 1:50 ` Stephen Rothwell
2013-09-18 11:53 ` David Howells [this message]
2013-09-18 12:47 ` Mimi Zohar
2013-09-18 3:17 ` Mimi Zohar
2013-09-24 2:06 ` James Morris
2013-09-24 9:31 ` David Howells
-- strict thread matches above, loose matches on Subject: below --
2013-09-25 21:21 David Howells
2013-09-27 7:40 ` James Morris
2013-09-27 16:31 ` David Howells
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=1320.1379505186@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=jmorris@namei.org \
--cc=keyrings@linux-nfs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=simo@redhat.com \
--cc=zohar@linux.vnet.ibm.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