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
Subject: Re: linux-next: manual merge of the akpm tree with the userns tree
Date: Wed, 16 May 2012 07:49:16 -0700 [thread overview]
Message-ID: <87ehqk5ggj.fsf@xmission.com> (raw)
In-Reply-To: <20120516193712.32157bcdc435465c27183baf@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 16 May 2012 19:37:12 +1000")
Stephen Rothwell <sfr@canb•auug.org.au> writes:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> kernel/signal.c between commit 54ba47edac90 ("userns: signal remove
> unnecessary map_cred_ns") from the userns tree and commit "pidns: use
> task_active_pid_ns in do_notify_parent" from the akpm tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Thanks.
Eric
next prev parent reply other threads:[~2012-05-16 14:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 9:37 linux-next: manual merge of the akpm tree with the userns tree Stephen Rothwell
2012-05-16 14:49 ` Eric W. Biederman [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-24 12:53 Stephen Rothwell
2012-11-26 13:13 Stephen Rothwell
2012-11-26 18:30 ` Eric W. Biederman
2015-07-02 4:26 Stephen Rothwell
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=87ehqk5ggj.fsf@xmission.com \
--to=ebiederm@xmission$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--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