Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes:
> 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).
Will do. Thank you.
Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
