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

Stephen Rothwell [off-list ref] 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 and commit:

  ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")

from the kvm-ppc tree.

Thanks.

This will go away when I merge the ppc-kvm topic branch.

cheers