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

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

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

2011-05-19 Thread Benjamin Herrenschmidt
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:

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

2010-10-18 Thread Stephen Rothwell
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