From: Al Viro <viro@ZenIV.linux.org.uk>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: Re: linux-next: manual merge of the userns tree with Linus' tree
Date: Thu, 17 Apr 2014 06:25:00 +0100 [thread overview]
Message-ID: <20140417052500.GZ18016@ZenIV.linux.org.uk> (raw)
In-Reply-To: <20140417150657.6d67e750081860b30f99715c@canb.auug.org.au>
On Thu, Apr 17, 2014 at 03:06:57PM +1000, Stephen Rothwell wrote:
> Hi Eric,
>
> Today's linux-next merge of the userns tree got a conflict in
> fs/namespace.c between various commits from Linus' tree and various
> commits from the userns tree.
>
> I fixed it up (hopefully - see below) and can carry the fix as necessary
> (no action is required).
Various commits include this:
commit 38129a13e6e71f666e0468e99fdd932a687b4d7e
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu Mar 20 21:10:51 2014 -0400
switch mnt_hash to hlist
present in v3.14... It's been there since before the merge window.
next prev parent reply other threads:[~2014-04-17 5:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-17 5:06 linux-next: manual merge of the userns tree with Linus' tree Stephen Rothwell
2014-04-17 5:25 ` Al Viro [this message]
2014-04-17 8:44 ` Eric W. Biederman
2014-04-22 1:37 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-06-25 8:22 Stephen Rothwell
2021-06-28 7:16 ` Stephen Rothwell
2021-05-26 4:51 Stephen Rothwell
2021-05-26 4:38 Stephen Rothwell
2021-05-26 4:32 Stephen Rothwell
2016-11-22 8:17 Stephen Rothwell
2016-11-22 17:44 ` Eric W. Biederman
2016-11-22 22:56 ` Stephen Rothwell
2016-07-08 6:13 Stephen Rothwell
2016-06-24 4:41 Stephen Rothwell
2014-04-09 2:45 Stephen Rothwell
2014-04-09 2:40 Stephen Rothwell
2014-04-09 2:39 Stephen Rothwell
2012-05-22 7:44 Stephen Rothwell
2012-05-22 14:29 ` 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=20140417052500.GZ18016@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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