History

Merge tag 'kvm-s390-next-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next-5.6

Paolo Bonzini committed 6 years ago

Commit f3633c22 parents ff2bd9f 23a60f87 files · +23 −11Browse files

Showing the changes to include/uapi (1 of 7 files). Show all

Unified · Split

include/uapi/linux/kvm.h+1−1
@@ -1034,7 +1034,7 @@ struct kvm_ppc_resize_hpt { · 1033 unmodified lines
1034#define KVM_CAP_ASYNC_PF_INT 1831034#define KVM_CAP_ASYNC_PF_INT 183
1035#define KVM_CAP_LAST_CPU 1841035#define KVM_CAP_LAST_CPU 184
1036#define KVM_CAP_SMALLER_MAXPHYADDR 1851036#define KVM_CAP_SMALLER_MAXPHYADDR 185
1037 1037#define KVM_CAP_S390_DIAG318 186
1038 1038
1039#ifdef KVM_CAP_IRQ_ROUTING1039#ifdef KVM_CAP_IRQ_ROUTING
1040 1040