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

2017-02-09 Thread Michael Ellerman
Stephen Rothwell writes: > Hi Paul, > > Today's linux-next merge of the kvm-ppc tree got conflicts in: > > arch/powerpc/include/asm/opal.h > arch/powerpc/platforms/powernv/opal-wrappers.S > > between commit: > > 1d0761d2557d ("powerpc/powernv: Initialise nest mmu") > > from the powerpc tree

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

2012-07-11 Thread Stephen Rothwell
Hi Alex, On Thu, 12 Jul 2012 07:56:46 +0200 Alexander Graf wrote: > > On 12.07.2012, at 05:57, Stephen Rothwell wrote: > > > Today's linux-next merge of the kvm-ppc tree got a conflict in > > arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59 > > ("powerpc: Fix usage of register mac

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

2012-07-11 Thread Alexander Graf
On 12.07.2012, at 05:57, Stephen Rothwell wrote: > Hi Alexander, > > Today's linux-next merge of the kvm-ppc tree got a conflict in > arch/powerpc/kvm/booke_interrupts.S between commit c75df6f96c59 > ("powerpc: Fix usage of register macros getting ready for %r0 change") > from the powerpc tree a