Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1527291 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-11-22 09:20 +0100 |
| Last post | 2016-11-23 00:00 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
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
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-11-22 09:20 +0100 |
| Subject | linux-next: manual merge of the userns tree with Linus' tree |
| Message-ID | <sGet4-4Fo-9@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | ebiederm@xmission.com (Eric W. Biederman) |
|---|---|
| Date | 2016-11-22 18:50 +0100 |
| Message-ID | <sGnmH-1SY-51@gated-at.bofh.it> |
| In reply to | #1527291 |
Stephen Rothwell <sfr@canb.auug.org.au> 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
[toc] | [prev] | [next] | [standalone]
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-11-23 00:00 +0100 |
| Message-ID | <sGscG-4Zb-11@gated-at.bofh.it> |
| In reply to | #1527778 |
Hi Eric, On Tue, 22 Nov 2016 11:44:25 -0600 ebiederm@xmission.com (Eric W. Biederman) wrote: > > > 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. Thanks. -- Cheers, Stephen Rothwell
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web