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

From: [email-masked] (Eric W. Biederman)
Date: Mon, 26 Nov 2012 12:30:31 -0600

Stephen Rothwell <[email-masked]> writes:

> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in kernel/fork.c
> between commit b2e0d98705e6 ("userns: Implement unshare of the user
> namespace") from the userns tree and commit  ("fork: unshare: remove dead
> cod") from the akpm tree.
>
> I fixed it up (I think - see below) and can carry the fix as necessary (no action
> is required).

Your resolution looks correct to me.  This was just of case of two patches
changing each others context. 

Eric