archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: "Serge E. Hallyn" <>
Cc:, David Howells <>,
	James Morris <>
Subject: linux-next: manual merge of the userns tree
Date: Wed, 5 Nov 2008 16:33:14 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

Hi Serge,

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.

Stephen Rothwell          

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

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

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-05  5:33 Stephen Rothwell [this message]
2008-11-05 11:49 ` linux-next: manual merge of the userns tree David Howells
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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* 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).