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

Hi Paul, Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in: arch/powerpc/include/asm/asm-prototypes.h between commit: 82de5797a260 ("powerpc: Remove extraneous header from asm-prototypes.h") from the powerpc-fixes tree and commit: ebe4535fbe7a ("KVM: PPC: Book3S HV:

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

Hi Paul, Today's linux-next merge of the kvm-ppc-paulus tree got a conflict in: arch/powerpc/include/asm/asm-prototypes.h between commit: 9e5f68842276 ("powerpc: Fix missing CRCs, add more asm-prototypes.h declarations") from the powerpc-fixes tree and commit: ebe4535fbe7a ("KVM: PPC: