From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Lorenzo Stoakes <lstoakes@gmail•com>
Subject: linux-next: manual merge of the userns tree with Linus' tree
Date: Tue, 22 Nov 2016 19:17:19 +1100 [thread overview]
Message-ID: <20161122191719.3e438d1e@canb.auug.org.au> (raw)
Hi Eric,
Today's linux-next merge of the userns tree got conflicts in:
arch/alpha/kernel/ptrace.c
arch/blackfin/kernel/ptrace.c
arch/cris/arch-v32/kernel/ptrace.c
arch/ia64/kernel/ptrace.c
arch/mips/kernel/ptrace32.c
arch/powerpc/kernel/ptrace32.c
include/linux/mm.h
kernel/ptrace.c
mm/memory.c
mm/nommu.c
between commit:
442486ec1096 ("mm: replace __access_remote_vm() write parameter with gup_flags")
(and others)
from Linus' tree and commit:
0cabf9a438e1 ("ptrace: Don't allow accessing an undumpable mm")
from the userns tree.
I just used the version of the userns tree from next-20161117 for today.
Please merge v4.9-rc2 and fix up the conflicts (or just rebase onto
v4.9-rc2).
--
Cheers,
Stephen Rothwell
next reply other threads:[~2016-11-22 8:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 8:17 Stephen Rothwell [this message]
2016-11-22 17:44 ` linux-next: manual merge of the userns tree with Linus' tree Eric W. Biederman
2016-11-22 22:56 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-06-25 8:22 Stephen Rothwell
2021-06-28 7:16 ` Stephen Rothwell
2021-05-26 4:51 Stephen Rothwell
2021-05-26 4:38 Stephen Rothwell
2021-05-26 4:32 Stephen Rothwell
2016-07-08 6:13 Stephen Rothwell
2016-06-24 4:41 Stephen Rothwell
2014-04-17 5:06 Stephen Rothwell
2014-04-17 5:25 ` Al Viro
2014-04-17 8:44 ` Eric W. Biederman
2014-04-22 1:37 ` Stephen Rothwell
2014-04-09 2:45 Stephen Rothwell
2014-04-09 2:40 Stephen Rothwell
2014-04-09 2:39 Stephen Rothwell
2012-05-22 7:44 Stephen Rothwell
2012-05-22 14:29 ` 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=20161122191719.3e438d1e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiederm@xmission$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lstoakes@gmail$(echo .)com \
/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