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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20161122191719.3e438d1e@canb.auug.org.au>
Date:   Tue, 22 Nov 2016 19:17:19 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Eric W. Biederman" <ebiederm@...ssion.com>
Cc:     linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
        Lorenzo Stoakes <lstoakes@...il.com>
Subject: linux-next: manual merge of the userns tree with Linus' tree

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