Hi Alexander,
Today's linux-next merge of the kvm-ppc tree got a conflict in
include/linux/kvm.h between commit 7a84428af7ca ("KVM: Add resampling
irqfds for level triggered interrupts") from Linus' tree and commit
2b3ac3d5956c ("KVM: PPC: booke: Add watchdog emulation") from the kvm-ppc
tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc include/linux/kvm.h index 0a6d6ba,99c3c50..0000000 --- a/include/linux/kvm.h +++ b/include/linux/kvm.h @@@ -625,7 -628,7 +628,8 @@@ struct kvm_ppc_smmu_info #ifdef __KVM_HAVE_READONLY_MEM #define KVM_CAP_READONLY_MEM 81 #endif -#define KVM_CAP_PPC_BOOKE_WATCHDOG 82 +#define KVM_CAP_IRQFD_RESAMPLE 82 ++#define KVM_CAP_PPC_BOOKE_WATCHDOG 83 #ifdef KVM_CAP_IRQ_ROUTING
pgpdL1YXaWXrY.pgp
Description: PGP signature
