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

Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commits: a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities") 578fd61d2d21 ("KVM: MIPS: Add 64BIT capability") from the kvm tree, commit: 2e60acebefd8 ("KVM: PPC: Reserve

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

Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commits: a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities") 578fd61d2d21 ("KVM: MIPS: Add 64BIT capability") from the kvm tree, commit: 2e60acebefd8 ("KVM: PPC: Reserve