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

Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/powerpc/include/asm/livepatch.h between commit: a4520b252765 ("powerpc/ftrace: Add support for livepatch to PPC32") from the powerpc tree and commit: a557abfd1a16 ("x86/livepatch: Validate __fentry__ location") fr

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

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

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

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

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

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

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

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/powerpc/platforms/iseries/setup.c between commit 8ee3e0d69623 ("powerpc: Remove the main legacy iSerie platform code") from the powerpc tree and commit bd2f55361f18 ("sched/rt: Use schedule_preempt_disabled()") from the tip tr

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

On Fri, 2011-05-20 at 14:14 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc: > Consolidate ipi message mux and demux") from the powerpc tree and commit > 184748cc50b2 ("sched:

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

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/powerpc/kernel/smp.c between commit 23d72bfd8f9f ("powerpc: Consolidate ipi message mux and demux") from the powerpc tree and commit 184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to smp_send_reschedule()")

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

Hi again, On Tue, 19 Oct 2010 15:48:49 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in > arch/powerpc/kernel/time.c between commit > cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using > timebase rather than PURR") from the powerpc

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

Hi all, Today's linux-next merge of the tip tree got a conflict in arch/powerpc/kernel/time.c between commit cf9efce0ce3136fa076f53e53154e98455229514 ("powerpc: Account time using timebase rather than PURR") from the powerpc tree and commit e360adbe29241a0194e10e20595360dd7b98a2b3 ("irq_work: Add