public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: ebiederm@xmission.com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "David S. Miller" <davem@davemloft.net>,
	linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	James Bottomley <James.Bottomley@suse.de>,
	Parisc List <linux-parisc@vger.kernel.org>
Subject: Re: Please include the namespace file-descriptors tree in linux-next
Date: Tue, 10 May 2011 20:04:17 -0700	[thread overview]
Message-ID: <m1sjsmdjke.fsf@fess.ebiederm.org> (raw)
In-Reply-To: <20110511102736.7a9dc881.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 11 May 2011 10:27:36 +1000")

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

> Hi Eric,
>
> On Tue, 10 May 2011 15:44:51 -0700 ebiederm@xmission.com (Eric W. Biederman) wrote:
>>
>> These changes have just been through review and I expect
>> to send Linus a pull request when the merge window opens.
>> 
>> This tree holds changes that significantly simply the userspace
>> interface to working with namespaces.
>> 
>> I had to pull some of net-next and the parisc tress to be able to
>> avoid conflicts with system call numbers.  Hopefully that is not
>> a problem.
>
> That should be fine as Dave's tree never rebases and the parisc tree
> looks pretty stable.  Just keep an eye on those trees, just in case.

Good point.  I have talked to James and Dave so they know I pulled their
trees.  My lazy side says I expect you will get a merge conflict with my
tree in linux-next if someone rebases.  But I will definitely keep my
eyes out and at the very least double check that all is well before I
send Linus a pull request.  

Eric

      reply	other threads:[~2011-05-11  3:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <m1sjsmp44c.fsf@fess.ebiederm.org>
2011-05-11  0:27 ` Please include the namespace file-descriptors tree in linux-next Stephen Rothwell
2011-05-11  3:04   ` Eric W. Biederman [this message]

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=m1sjsmdjke.fsf@fess.ebiederm.org \
    --to=ebiederm@xmission.com \
    --cc=James.Bottomley@suse.de \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-parisc@vger.kernel.org \
    --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