Re: linux-next: manual merge of the tip tree with the powerpc tree

2017-11-01 Thread Kees Cook
On Tue, Oct 31, 2017 at 10:53 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in: > > arch/powerpc/mm/numa.c > > between commit: > > cee5405da402 ("powerpc/hotplug: Improve responsiveness of hotplug change") > > from the powerpc tree and commi

linux-next: manual merge of the tip tree with the powerpc tree

2017-10-31 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/powerpc/mm/numa.c between commit: cee5405da402 ("powerpc/hotplug: Improve responsiveness of hotplug change") from the powerpc tree and commit: df7e828c1b69 ("timer: Remove init_timer_deferrable() in favor of timer

linux-next: manual merge of the tip tree with the powerpc tree

2017-04-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: kernel/kprobes.c between commits: 49e0b4658fe6 ("kprobes: Convert kprobe_lookup_name() to a function") 290e3070762a ("powerpc/kprobes: Fix handling of function offsets on ABIv2") from the powerpc tree and commit: 1d58

Re: linux-next: manual merge of the tip tree with the powerpc tree

2017-02-21 Thread Stephen Rothwell
Hi all, On Fri, 17 Feb 2017 12:48:43 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > arch/powerpc/kernel/asm-offsets.c > > between commit: > > 454656155110 ("powerpc/asm: Use OFFSET macro in asm-offsets.c") > > from the powerpc tree and c

linux-next: manual merge of the tip tree with the powerpc tree

2017-02-16 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/powerpc/kernel/asm-offsets.c between commit: 454656155110 ("powerpc/asm: Use OFFSET macro in asm-offsets.c") from the powerpc tree and commit: 8c8b73c4811f ("sched/cputime, powerpc: Prepare accounting structure for