linux-next: manual merge of the userns tree with Linus' tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the userns tree with Linus' tree
Date	2016-11-22 09:20 +0100
Message-ID	<sGet4-4Fo-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the userns tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-22 09:20 +0100
  Re: linux-next: manual merge of the userns tree with Linus' tree ebiederm@xmission.com (Eric W. Biederman) - 2016-11-22 18:50 +0100
    Re: linux-next: manual merge of the userns tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-11-23 00:00 +0100

csiph-web