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

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") >

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

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

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

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 and commit: ab9bad0ead9a

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

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 and commit: ab9bad0ead9a

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

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

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

Hi Alex, On Thu, 12 Jul 2012 07:56:46 +0200 Alexander Graf ag...@suse.de 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

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

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

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

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 and commit fc372c0843b8 ("booke: Added crit/mc exception

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

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 and commit fc372c0843b8 (booke: Added crit/mc exception handler

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

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 and