diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-10-24 13:44:11 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-10-24 13:44:11 -0700 |
| commit | 96917bb3a377e1ed103fd5c420a95e5fb25ca104 (patch) | |
| tree | 59e0ef14e8707efba95d2f795742ba69a03bc8d0 /tools/include | |
| parent | 86d6f77a3cce1189ab7c31e52e4d47ca58e7a601 (diff) | |
| parent | 337a0a0b63f1c30195733eaacf39e4310a592a68 (diff) | |
| download | linux-96917bb3a377e1ed103fd5c420a95e5fb25ca104.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
include/linux/net.h
a5ef058dc4d9 ("net: introduce and use custom sockopt socket flag")
e993ffe3da4b ("net: flag sockets supporting msghdr originated zerocopy")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/linux/kvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index eed0315a77a6..0d5d4419139a 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/include/uapi/linux/kvm.h @@ -1177,6 +1177,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_VM_DISABLE_NX_HUGE_PAGES 220 #define KVM_CAP_S390_ZPCI_OP 221 #define KVM_CAP_S390_CPU_TOPOLOGY 222 +#define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223 #ifdef KVM_CAP_IRQ_ROUTING |