All of 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>,
	linux-next@vger.kernel.org, James Morris <jmorris@namei.org>
Subject: Re: linux-next: manual merge of the userns tree
Date: Wed, 05 Nov 2008 11:49:03 +0000	[thread overview]
Message-ID: <22795.1225885743@redhat.com> (raw)
In-Reply-To: <20081105163314.30c72d57.sfr@canb.auug.org.au>

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

> 
> Today's linux-next merge of the userns tree got conflicts caused by the
> creds tree that the userns tree is based on.  I excluded the creds tree
> (since the conflicts were a bit complex) so I need to exclude the userns
> tree as well for today.

Can you give more details?

I wonder if I need to be more proactive in getting the wrapper patches pushed
into their respective subsys trees.

David

  reply	other threads:[~2008-11-05 11:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-05  5:33 linux-next: manual merge of the userns tree Stephen Rothwell
2008-11-05 11:49 ` David Howells [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-10-19 12:15 Mark Brown
2013-10-19 23:47 ` Eric W. Biederman

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=22795.1225885743@redhat.com \
    --to=dhowells@redhat.com \
    --cc=jmorris@namei.org \
    --cc=linux-next@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.