Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
