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

2016-04-18 Thread Michael Ellerman
On Mon, 2016-04-18 at 14:23 +1000, Stephen Rothwell wrote: > Hi Jiri, > > Today's linux-next merge of the livepatching tree got a conflict in: > > arch/powerpc/Kconfig > > between commit: > > 7f2bd0063342 ("powerpc/mm: enable page parallel initialisation") > > from Linus' tree and commit:

linux-next: manual merge of the livepatching tree with Linus' tree

2016-04-17 Thread Stephen Rothwell
Hi Jiri, Today's linux-next merge of the livepatching tree got a conflict in: arch/powerpc/Kconfig between commit: 7f2bd0063342 ("powerpc/mm: enable page parallel initialisation") from Linus' tree and commit: 85baa095497f ("powerpc/livepatch: Add live patching support on ppc64le") from