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

Hi Alexander, Today's linux-next merge of the kvm-ppc tree got a conflict in include/uapi/linux/kvm.h between commit 717abd208dff ("KVM: Add capability to advertise PSCI v0.2 support") from the kvm-arm tree and commit f2e91042a807 ("KVM: PPC: Add CAP to indicate hcall fixes") from the kvm-ppc tree

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

Hi Alexander, Today's linux-next merge of the kvm-ppc tree got a conflict in arch/powerpc/include/asm/processor.h between commit 51ae8d4a2b9e ("powerpc: move debug registers in a structure") from the powerpc tree and commit 95791988fec6 ("powerpc: move debug registers in a structure") from the kvm