Subject: Re: linux-next: manual merge of the userns tree with Linus' tree

From: Al Viro <[email-masked]>
Date: Thu, 17 Apr 2014 06:25:00 +0100

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 <[email-masked]>
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.