From: ebiederm@xmission•com (Eric W. Biederman)
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Alan Cox <alan@linux•intel.com>
Subject: Re: linux-next: manual merge of the akpm tree with the userns tree
Date: Mon, 26 Nov 2012 12:30:31 -0600 [thread overview]
Message-ID: <87624stdx4.fsf@xmission.com> (raw)
In-Reply-To: <20121127001320.12439806f19c9b6ccce4e895@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 27 Nov 2012 00:13:20 +1100")
Stephen Rothwell <sfr@canb•auug.org.au> 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
next prev parent reply other threads:[~2012-11-26 18:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-26 13:13 linux-next: manual merge of the akpm tree with the userns tree Stephen Rothwell
2012-11-26 18:30 ` Eric W. Biederman [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-02 4:26 Stephen Rothwell
2012-09-24 12:53 Stephen Rothwell
2012-05-16 9:37 Stephen Rothwell
2012-05-16 14:49 ` 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=87624stdx4.fsf@xmission.com \
--to=ebiederm@xmission$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alan@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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