diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2026-02-23 19:06:33 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2026-02-23 19:06:33 +0300 |
| commit | 3ecf0b4a0e0ed4783aa32c5f3e42d23c7021e1c8 (patch) | |
| tree | a0e19090026cb3ed3c1ef0091b151ef6d76a80ab /include/uapi/linux | |
| parent | 9cd168a2720bc614647dd20bc5d1c308c56a44ec (diff) | |
| parent | 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f (diff) | |
| download | linux-3ecf0b4a0e0ed4783aa32c5f3e42d23c7021e1c8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 7.0-rc1
Cross-merge trees after 7.0-rc1.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/mshv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/mshv.h b/include/uapi/linux/mshv.h index dee3ece28ce5..e0645a34b55b 100644 --- a/include/uapi/linux/mshv.h +++ b/include/uapi/linux/mshv.h @@ -27,6 +27,8 @@ enum { MSHV_PT_BIT_X2APIC, MSHV_PT_BIT_GPA_SUPER_PAGES, MSHV_PT_BIT_CPU_AND_XSAVE_FEATURES, + MSHV_PT_BIT_NESTED_VIRTUALIZATION, + MSHV_PT_BIT_SMT_ENABLED_GUEST, MSHV_PT_BIT_COUNT, }; |