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

2016-04-18 Thread Michael Ellerman
On Mon, 2016-04-18 at 14:27 +1000, Stephen Rothwell wrote: > Hi Jiri, > > Today's linux-next merge of the livepatching tree got a conflict in: > > arch/powerpc/kernel/process.c > > between commit: > > 7f92bc569455 ("powerpc: sparse: Include headers for __weak symbols") > > from the powerpc

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

2016-04-17 Thread Stephen Rothwell
Hi Jiri, Today's linux-next merge of the livepatching tree got a conflict in: arch/powerpc/kernel/process.c between commit: 7f92bc569455 ("powerpc: sparse: Include headers for __weak symbols") from the powerpc tree and commit: 5d31a96e6c01 ("powerpc/livepatch: Add livepatch stack to str