LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: dhowells@redhat.com, "Serge E. Hallyn" <serue@us.ibm.com>,
	lkml <linux-kernel@vger.kernel.org>,
	jmorris@us.ibm.com
Subject: Re: [PATCH] User namespaces: set of cleanups (v2)
Date: Sun, 26 Oct 2008 16:04:55 +0000	[thread overview]
Message-ID: <11588.1225037095@redhat.com> (raw)
In-Reply-To: <20081026225324.6231397d.sfr@canb.auug.org.au>

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Yes. Or whatever it is based on now if that merges OK with Linus' head
> (try a test merge).  Just don't base on linux-next :-)

It's based on Linus's head at the moment, give or take the last few bits he
pulled in which I haven't dealt with yet.

> What I want is exactly what you will ask/have asked Linus to fetch but
> without the branch name changing .. I care more about the name changing
> than the contents changing.
> 
> So .. what branch do I fetch tomorrow?  (Hint: if you have your version
> for Linus checked out then type "git branch next" and reply to this email
> saying "next" :-))

I asked him to pull creds-v4 last:

	http://git.kernel.org/?p=linux/kernel/git/dhowells/cred-2.6.git;a=shortlog;h=creds-v4

I'd quite like to amend the name of the branch to something more sensible,
since the 'v<N>' represented new versions based on fixing up merges with
Linus's tree rather than changing my patches.

However, if you'd rather I just threw new merges on top of that, then I can do
that - it's just got a silly branch name.

Alternatively, if you'd rather James pulled it into his 'next' branch, he
might be amenable to that.

David

  parent reply	other threads:[~2008-10-26 16:05 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-24 17:48 [PATCH] User namespaces: set of cleanups (v2) Serge E. Hallyn
2008-10-24 18:44 ` David Howells
2008-10-24 19:18   ` Serge E. Hallyn
2008-10-24 19:40   ` David Howells
2008-10-25  2:08   ` Stephen Rothwell
2008-10-26 11:07   ` David Howells
2008-10-26 11:53     ` Stephen Rothwell
2008-10-26 16:04     ` David Howells [this message]
2008-10-26 16:11     ` David Howells
2008-10-25  2:05 ` Stephen Rothwell
2008-10-28 16:21   ` Serge E. Hallyn
2008-10-29  7:36     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-10-20 23:01 Serge E. Hallyn

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=11588.1225037095@redhat.com \
    --to=dhowells@redhat.com \
    --cc=jmorris@us.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=serue@us.ibm.com \
    --cc=sfr@canb.auug.org.au \
    /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 NNTP newsgroup(s).