sys/linux: run make extract

Make the following changes for extraction to succeed:
- drop the KVM API constants for features removed in 6.9;
- hardcode the three TUNNEL_*_OPT constants that cannot be extracted due to a header change;
- hardcode the HCI_OP_* constants removed in 99fca36c8b412 ("Bluetooth: HCI: Remove HCI_AMP support");
- hardcode the L2CAP_* constants removed in e7b02296fb40 ("Bluetooth: Remove BT_HS");
- hardcode LANDLOCK_ACCESS_FS_IOCTL_DEV until it hits upstream.

11 files changed, 84 insertions, 84 deletions

diff --git a/sys/linux/bpf_prog.txt.const b/sys/linux/bpf_prog.txt.const
index 4f089c7bf..0fc5fcc37 100644
--- a/sys/linux/bpf_prog.txt.const
+++ b/sys/linux/bpf_prog.txt.const
@@ -10,7 +10,6 @@ BPF_B0 = 2
 BPF_CALL0 = 8
 BPF_CORE_RELO_SIZE = 16
 BPF_DIV0 = 3
-BPF_DW = 24
 BPF_DW0 = 3
 BPF_END0 = 13
 BPF_EXIT0 = 9
diff --git a/sys/linux/dev_kvm.txt b/sys/linux/dev_kvm.txt
index f5230d645..fd3c65448 100644
--- a/sys/linux/dev_kvm.txt
+++ b/sys/linux/dev_kvm.txt
@@ -43,15 +43,10 @@ ioctl$KVM_SET_TSS_ADDR(fd fd_kvmvm, cmd const[KVM_SET_TSS_ADDR], arg flags[kvm_x
 ioctl$KVM_SET_IDENTITY_MAP_ADDR(fd fd_kvmvm, cmd const[KVM_SET_IDENTITY_MAP_ADDR], arg ptr[in, flags[kvm_guest_addrs, int64]])
 ioctl$KVM_SET_BOOT_CPU_ID(fd fd_kvmvm, cmd const[KVM_SET_BOOT_CPU_ID], arg ptr[in, intptr[0:2]])
 ioctl$KVM_PPC_GET_PVINFO(fd fd_kvmvm, cmd const[KVM_PPC_GET_PVINFO], arg buffer[out])
-ioctl$KVM_ASSIGN_PCI_DEVICE(fd fd_kvmvm, cmd const[KVM_ASSIGN_PCI_DEVICE], arg ptr[in, kvm_assigned_pci_dev])
-ioctl$KVM_DEASSIGN_PCI_DEVICE(fd fd_kvmvm, cmd const[KVM_DEASSIGN_PCI_DEVICE], arg ptr[in, kvm_assigned_pci_dev])
-ioctl$KVM_ASSIGN_DEV_IRQ(fd fd_kvmvm, cmd const[KVM_ASSIGN_DEV_IRQ], arg ptr[in, kvm_assigned_irq])
-ioctl$KVM_DEASSIGN_DEV_IRQ(fd fd_kvmvm, cmd const[KVM_DEASSIGN_DEV_IRQ], arg ptr[in, kvm_assigned_irq])
 ioctl$KVM_SET_GSI_ROUTING(fd fd_kvmvm, cmd const[KVM_SET_GSI_ROUTING], arg ptr[in, kvm_irq_routing])
 ioctl$KVM_ASSIGN_SET_MSIX_NR(fd fd_kvmvm, cmd const[KVM_ASSIGN_SET_MSIX_NR], arg ptr[in, kvm_assigned_msix_nr])
 ioctl$KVM_ASSIGN_SET_MSIX_ENTRY(fd fd_kvmvm, cmd const[KVM_ASSIGN_SET_MSIX_ENTRY], arg ptr[in, kvm_assigned_msix_entry])
 ioctl$KVM_IOEVENTFD(fd fd_kvmvm, cmd const[KVM_IOEVENTFD], arg ptr[in, kvm_ioeventfd])
-ioctl$KVM_ASSIGN_SET_INTX_MASK(fd fd_kvmvm, cmd const[KVM_ASSIGN_SET_INTX_MASK], arg ptr[in, kvm_assigned_pci_dev])
 ioctl$KVM_SIGNAL_MSI(fd fd_kvmvm, cmd const[KVM_SIGNAL_MSI], arg ptr[in, kvm_msi])
 ioctl$KVM_CREATE_PIT2(fd fd_kvmvm, cmd const[KVM_CREATE_PIT2], arg ptr[in, kvm_pit_config])
 ioctl$KVM_GET_PIT(fd fd_kvmvm, cmd const[KVM_GET_PIT], arg ptr[out, kvm_pit_state2])
@@ -153,7 +148,6 @@ ioctl$KVM_HAS_DEVICE_ATTR(fd fd_kvmdev, cmd const[KVM_HAS_DEVICE_ATTR], arg ptr[
 
 kvm_mem_region_flags = KVM_MEM_LOG_DIRTY_PAGES, KVM_MEM_READONLY
 kvm_mp_state = KVM_MP_STATE_RUNNABLE, KVM_MP_STATE_UNINITIALIZED, KVM_MP_STATE_INIT_RECEIVED, KVM_MP_STATE_HALTED, KVM_MP_STATE_SIPI_RECEIVED, KVM_MP_STATE_STOPPED, KVM_MP_STATE_CHECK_STOP, KVM_MP_STATE_OPERATING, KVM_MP_STATE_LOAD
-kvm_assigned_irq_flags = KVM_DEV_IRQ_HOST_INTX, KVM_DEV_IRQ_HOST_MSI, KVM_DEV_IRQ_HOST_MSIX, KVM_DEV_IRQ_GUEST_INTX, KVM_DEV_IRQ_GUEST_MSI, KVM_DEV_IRQ_GUEST_MSIX
 kvm_irq_routing_entry_type = KVM_IRQ_ROUTING_IRQCHIP, KVM_IRQ_ROUTING_MSI, KVM_IRQ_ROUTING_S390_ADAPTER, KVM_IRQ_ROUTING_HV_SINT
 kvm_ioeventfd_flags = KVM_IOEVENTFD_FLAG_DATAMATCH, KVM_IOEVENTFD_FLAG_PIO, KVM_IOEVENTFD_FLAG_DEASSIGN, KVM_IOEVENTFD_FLAG_VIRTIO_CCW_NOTIFY
 kvm_ioeventfd_len = 0, 1, 2, 4, 8
@@ -167,7 +161,6 @@ kvm_mce_flags = 1, 2, 4
 kvm_mcg_status = MCG_STATUS_RIPV, MCG_STATUS_EIPV, MCG_STATUS_MCIP, MCG_STATUS_LMCES
 kvm_mce_status = MCI_STATUS_VAL, MCI_STATUS_OVER, MCI_STATUS_UC, MCI_STATUS_EN, MCI_STATUS_MISCV, MCI_STATUS_ADDRV, MCI_STATUS_PCC, MCI_STATUS_S, MCI_STATUS_AR
 kvm_cpuid_flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX, KVM_CPUID_FLAG_STATEFUL_FUNC, KVM_CPUID_FLAG_STATE_READ_NEXT
-kvm_dev_flags = KVM_DEV_ASSIGN_ENABLE_IOMMU, KVM_DEV_ASSIGN_PCI_2_3, KVM_DEV_ASSIGN_MASK_INTX
 kvm_vcpu_target = KVM_ARM_TARGET_CORTEX_A53, KVM_ARM_TARGET_AEM_V8, KVM_ARM_TARGET_FOUNDATION_V8, KVM_ARM_TARGET_CORTEX_A57, KVM_ARM_TARGET_XGENE_POTENZA, KVM_ARM_TARGET_GENERIC_V8
 kvm_vcpu_features_arm64 = KVM_ARM_VCPU_POWER_OFF, KVM_ARM_VCPU_EL1_32BIT, KVM_ARM_VCPU_PSCI_0_2, KVM_ARM_VCPU_PMU_V3
 
@@ -527,22 +520,6 @@ kvm_irq_routing_hv_sint {
 	sint	int32
 }
 
-kvm_assigned_irq {
-	assigned_dev_id	int32
-	host_irq	const[0, int32]
-	guest_irq	int32
-	flags		flags[kvm_assigned_irq_flags, int32]
-	reserved	array[const[0, int32], 12]
-}
-
-kvm_assigned_pci_dev {
-	devid	int32
-	busnr	int32
-	devfn	int32
-	flags	flags[kvm_dev_flags, int32]
-	segnr	int32
-}
-
 kvm_xcr {
 	xcr	int32
 	reserv	const[0, int32]
diff --git a/sys/linux/dev_kvm.txt.const b/sys/linux/dev_kvm.txt.const
index 52e6283a0..94bb2bf90 100644
--- a/sys/linux/dev_kvm.txt.const
+++ b/sys/linux/dev_kvm.txt.const
@@ -55,15 +55,6 @@ KVM_CREATE_VCPU = 44609, mips64le:ppc64le:536915521
 KVM_CREATE_VM = 44545, mips64le:ppc64le:536915457
 KVM_DEASSIGN_DEV_IRQ = 1077980789
 KVM_DEASSIGN_PCI_DEVICE = 1077980786
-KVM_DEV_ASSIGN_ENABLE_IOMMU = 1
-KVM_DEV_ASSIGN_MASK_INTX = 4
-KVM_DEV_ASSIGN_PCI_2_3 = 2
-KVM_DEV_IRQ_GUEST_INTX = 256
-KVM_DEV_IRQ_GUEST_MSI = 512
-KVM_DEV_IRQ_GUEST_MSIX = 1024
-KVM_DEV_IRQ_HOST_INTX = 1
-KVM_DEV_IRQ_HOST_MSI = 2
-KVM_DEV_IRQ_HOST_MSIX = 4
 KVM_DEV_TYPE_FLIC = 6
 KVM_DEV_TYPE_FSL_MPIC_20 = 1
 KVM_DEV_TYPE_FSL_MPIC_42 = 2
@@ -113,7 +104,7 @@ KVM_GUESTDBG_USE_HW_BP = 131072, arm64:mips64le:???, s390x:65536
 KVM_GUESTDBG_USE_SW_BP = 65536, mips64le:s390x:???
 KVM_HAS_DEVICE_ATTR = 1075359459, mips64le:ppc64le:2149101283
 KVM_HC_MAP_GPA_RANGE = 12
-KVM_HYPERV_EVENTFD = 1075359421, mips64le:ppc64le:2149101245
+KVM_HYPERV_EVENTFD = 1075359421, arm64:mips64le:ppc64le:s390x:???
 KVM_INTERRUPT = 1074048646, mips64le:ppc64le:2147790470
 KVM_IOEVENTFD = 1077980793, mips64le:ppc64le:2151722617
 KVM_IOEVENTFD_FLAG_DATAMATCH = 1
@@ -148,15 +139,15 @@ KVM_MSR_EXIT_REASON_INVAL = 1
 KVM_MSR_EXIT_REASON_UNKNOWN = 2
 KVM_NMI = 44698, mips64le:ppc64le:536915610
 KVM_PPC_ALLOCATE_HTAB = 3221532327
-KVM_PPC_GET_PVINFO = 1082175137, mips64le:ppc64le:2155916961
-KVM_PPC_GET_SMMU_INFO = 2186325670, mips64le:ppc64le:1112583846
+KVM_PPC_GET_PVINFO = 386:amd64:arm64:mips64le:s390x:???, ppc64le:2155916961
+KVM_PPC_GET_SMMU_INFO = 386:amd64:arm64:mips64le:s390x:???, ppc64le:1112583846
 KVM_REGISTER_COALESCED_MMIO = 1074835047, mips64le:ppc64le:2148576871
 KVM_REINJECT_CONTROL = 44657, mips64le:ppc64le:536915569
 KVM_RUN = 44672, mips64le:ppc64le:536915584
 KVM_RUN_SIZE = 2352, s390x:2368
-KVM_S390_INTERRUPT = 1074835092, mips64le:ppc64le:2148576916
-KVM_S390_UCAS_MAP = 1075359312, mips64le:ppc64le:2149101136
-KVM_S390_UCAS_UNMAP = 1075359313, mips64le:ppc64le:2149101137
+KVM_S390_INTERRUPT = 386:amd64:arm64:mips64le:ppc64le:???, s390x:1074835092
+KVM_S390_UCAS_MAP = 386:amd64:arm64:mips64le:ppc64le:???, s390x:1075359312
+KVM_S390_UCAS_UNMAP = 386:amd64:arm64:mips64le:ppc64le:???, s390x:1075359313
 KVM_S390_VCPU_FAULT = 1074310738, 386:1074048594, mips64le:ppc64le:2148052562
 KVM_SETUP_CPL3 = 8
 KVM_SETUP_PAE = 2
@@ -208,8 +199,8 @@ KVM_STATE_NESTED_SMM_VMXON = 2, arm64:mips64le:ppc64le:s390x:???
 KVM_TPR_ACCESS_REPORTING = 3223891602
 KVM_TRANSLATE = 3222843013
 KVM_UNREGISTER_COALESCED_MMIO = 1074835048, mips64le:ppc64le:2148576872
-KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK = 2
-KVM_X2APIC_API_USE_32BIT_IDS = 1
+KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK = 2, arm64:mips64le:ppc64le:s390x:???
+KVM_X2APIC_API_USE_32BIT_IDS = 1, arm64:mips64le:ppc64le:s390x:???
 KVM_X86_DISABLE_EXITS_CSTATE = 8
 KVM_X86_DISABLE_EXITS_HLT = 2
 KVM_X86_DISABLE_EXITS_MWAIT = 1
diff --git a/sys/linux/dev_ptmx.txt.const b/sys/linux/dev_ptmx.txt.const
index a1d631afa..43899161b 100644
--- a/sys/linux/dev_ptmx.txt.const
+++ b/sys/linux/dev_ptmx.txt.const
@@ -2,44 +2,44 @@
 arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x
 AT_FDCWD = 18446744073709551516
 FIONREAD = 21531, mips64le:18047, ppc64le:1074030207
-GIO_CMAP = 19312
-GIO_FONT = 19296
-GIO_FONTX = 19307
-GIO_SCRNMAP = 19264
-GIO_UNIMAP = 19302
-GIO_UNISCRNMAP = 19305
-KDADDIO = 19252
-KDDELIO = 19253
-KDDISABIO = 19255
-KDENABIO = 19254
-KDFONTOP = 19314
-KDGETKEYCODE = 19276
-KDGETLED = 19249
-KDGETMODE = 19259
-KDGKBDIACR = 19274
-KDGKBENT = 19270
-KDGKBLED = 19300
-KDGKBMETA = 19298
-KDGKBMODE = 19268
-KDGKBSENT = 19272
-KDGKBTYPE = 19251
-KDMKTONE = 19248
-KDSETKEYCODE = 19277
-KDSETLED = 19250
-KDSETMODE = 19258
-KDSIGACCEPT = 19278
-KDSKBENT = 19271
-KDSKBLED = 19301
-KDSKBMETA = 19299
-KDSKBMODE = 19269
-KDSKBSENT = 19273
+GIO_CMAP = 19312, mips64le:ppc64le:536890224
+GIO_FONT = 19296, mips64le:ppc64le:536890208
+GIO_FONTX = 19307, mips64le:ppc64le:536890219
+GIO_SCRNMAP = 19264, mips64le:ppc64le:536890176
+GIO_UNIMAP = 19302, mips64le:ppc64le:536890214
+GIO_UNISCRNMAP = 19305, mips64le:ppc64le:536890217
+KDADDIO = 19252, mips64le:ppc64le:536890164
+KDDELIO = 19253, mips64le:ppc64le:536890165
+KDDISABIO = 19255, mips64le:ppc64le:536890167
+KDENABIO = 19254, mips64le:ppc64le:536890166
+KDFONTOP = 19314, mips64le:ppc64le:536890226
+KDGETKEYCODE = 19276, mips64le:ppc64le:536890188
+KDGETLED = 19249, mips64le:ppc64le:536890161
+KDGETMODE = 19259, mips64le:ppc64le:536890171
+KDGKBDIACR = 19274, mips64le:ppc64le:536890186
+KDGKBENT = 19270, mips64le:ppc64le:536890182
+KDGKBLED = 19300, mips64le:ppc64le:536890212
+KDGKBMETA = 19298, mips64le:ppc64le:536890210
+KDGKBMODE = 19268, mips64le:ppc64le:536890180
+KDGKBSENT = 19272, mips64le:ppc64le:536890184
+KDGKBTYPE = 19251, mips64le:ppc64le:536890163
+KDMKTONE = 19248, mips64le:ppc64le:536890160
+KDSETKEYCODE = 19277, mips64le:ppc64le:536890189
+KDSETLED = 19250, mips64le:ppc64le:536890162
+KDSETMODE = 19258, mips64le:ppc64le:536890170
+KDSIGACCEPT = 19278, mips64le:ppc64le:536890190
+KDSKBENT = 19271, mips64le:ppc64le:536890183
+KDSKBLED = 19301, mips64le:ppc64le:536890213
+KDSKBMETA = 19299, mips64le:ppc64le:536890211
+KDSKBMODE = 19269, mips64le:ppc64le:536890181
+KDSKBSENT = 19273, mips64le:ppc64le:536890185
 KD_FONT_OP_COPY = 3
 KD_FONT_OP_GET = 1
 KD_FONT_OP_SET = 0
 KD_FONT_OP_SET_DEFAULT = 2
 KD_GRAPHICS = 1
 KD_TEXT = 0
-KIOCSOUND = 19247
+KIOCSOUND = 19247, mips64le:ppc64le:536890159
 K_ESCPREFIX = 4
 K_METABIT = 3
 K_OFF = 4
@@ -48,14 +48,14 @@ NCC = 8, ppc64le:10
 NCCS = 19, mips64le:23
 N_NULL = 27
 N_TTY = 0
-PIO_CMAP = 19313
-PIO_FONT = 19297
-PIO_FONTRESET = 19309
-PIO_FONTX = 19308
-PIO_SCRNMAP = 19265
-PIO_UNIMAP = 19303
-PIO_UNIMAPCLR = 19304
-PIO_UNISCRNMAP = 19306
+PIO_CMAP = 19313, mips64le:ppc64le:536890225
+PIO_FONT = 19297, mips64le:ppc64le:536890209
+PIO_FONTRESET = 19309, mips64le:ppc64le:536890221
+PIO_FONTX = 19308, mips64le:ppc64le:536890220
+PIO_SCRNMAP = 19265, mips64le:ppc64le:536890177
+PIO_UNIMAP = 19303, mips64le:ppc64le:536890215
+PIO_UNIMAPCLR = 19304, mips64le:ppc64le:536890216
+PIO_UNISCRNMAP = 19306, mips64le:ppc64le:536890218
 TCFLSH = 21515, mips64le:21511, ppc64le:536900639
 TCGETA = 21509, mips64le:21505, ppc64le:1075082263
 TCGETS = 21505, mips64le:21517, ppc64le:1076655123
diff --git a/sys/linux/dev_vhci.txt b/sys/linux/dev_vhci.txt
index b74691521..1b599881d 100644
--- a/sys/linux/dev_vhci.txt
+++ b/sys/linux/dev_vhci.txt
@@ -47,6 +47,9 @@ vhci_vendor_pkt {
 	opcode	flags[vhci_vendor_pkt_opcode, int8]
 }
 
+define HCI_PRIMARY	0x00
+define HCI_AMP	0x01
+
 vhci_vendor_pkt_opcode = HCI_PRIMARY, HCI_AMP, HCI_EXTERNAL_CONFIG, HCI_RAW_DEVICE
 
 type hci_acl_hdr[DATA] {
@@ -85,6 +88,18 @@ hci_cis_params {
 	s_rtn	int8
 } [packed]
 
+# TODO: remove these definitions when they are no more present in LTS kernels.
+define HCI_OP_CREATE_PHY_LINK	0x0435
+define HCI_OP_ACCEPT_PHY_LINK	0x0436
+define HCI_OP_DISCONN_PHY_LINK	0x0437
+define HCI_OP_CREATE_LOGICAL_LINK	0x0438
+define HCI_OP_ACCEPT_LOGICAL_LINK	0x0439
+define HCI_OP_DISCONN_LOGICAL_LINK	0x043a
+define HCI_OP_LOGICAL_LINK_CANCEL	0x043b
+define HCI_OP_READ_LOCAL_AMP_INFO	0x1409
+define HCI_OP_READ_LOCAL_AMP_ASSOC	0x140a
+define HCI_OP_WRITE_REMOTE_AMP_ASSOC	0x140b
+
 hci_command_hdr_un [
 	accept_conn_req			hci_command_packet_t[HCI_OP_ACCEPT_CONN_REQ, hci_cp_accept_conn_req]
 	accept_phy_link			hci_command_packet_t[HCI_OP_ACCEPT_PHY_LINK, hci_cp_accept_phy_link]
diff --git a/sys/linux/fs_fuse.txt.const b/sys/linux/fs_fuse.txt.const
index 4be173c01..84a36799d 100644
--- a/sys/linux/fs_fuse.txt.const
+++ b/sys/linux/fs_fuse.txt.const
@@ -23,7 +23,7 @@ FUSE_FLOCK_LOCKS = 1024
 FUSE_HANDLE_KILLPRIV = 524288
 FUSE_HAS_IOCTL_DIR = 2048
 FUSE_IOCTL_RETRY = 4
-FUSE_KERNEL_MINOR_VERSION = 39
+FUSE_KERNEL_MINOR_VERSION = 40
 FUSE_KERNEL_VERSION = 7
 FUSE_MAX_PAGES = 4194304
 FUSE_MIN_READ_BUFFER = 8192
diff --git a/sys/linux/io_uring.txt.const b/sys/linux/io_uring.txt.const
index 9df4f0906..2b38cf45c 100644
--- a/sys/linux/io_uring.txt.const
+++ b/sys/linux/io_uring.txt.const
@@ -38,7 +38,7 @@ IORING_OP_FADVISE = 24
 IORING_OP_FALLOCATE = 17
 IORING_OP_FILES_UPDATE = 20
 IORING_OP_FSYNC = 3
-IORING_OP_LAST = 55
+IORING_OP_LAST = 56
 IORING_OP_LINKAT = 39
 IORING_OP_LINK_TIMEOUT = 15
 IORING_OP_MADVISE = 25
diff --git a/sys/linux/l2cap.txt b/sys/linux/l2cap.txt
index 58858af44..f38a19b5d 100644
--- a/sys/linux/l2cap.txt
+++ b/sys/linux/l2cap.txt
@@ -5,6 +5,15 @@ include <net/bluetooth/bluetooth.h>
 include <net/bluetooth/hci_sock.h>
 include <net/bluetooth/l2cap.h>
 
+# The following constants were removed from upstream in e7b02296fb40 ("Bluetooth: Remove BT_HS").
+# TODO: delete them together with the corresponding structs once they are removed from LTS kernels.
+define L2CAP_CREATE_CHAN_REQ	0x0c
+define L2CAP_CREATE_CHAN_RSP	0x0d
+define L2CAP_MOVE_CHAN_REQ	0x0e
+define L2CAP_MOVE_CHAN_RSP	0x0f
+define L2CAP_MOVE_CHAN_CFM	0x10
+define L2CAP_MOVE_CHAN_CFM_RSP	0x11
+
 l2cap_hdr_un [
 	l2cap_cid_signaling	l2cap_hdr_t[L2CAP_CID_SIGNALING, array[l2cap_cid_signaling_un]]
 	l2cap_cid_le_signaling	l2cap_hdr_t[L2CAP_CID_LE_SIGNALING, l2cap_cid_le_signaling_un]
diff --git a/sys/linux/landlock.txt b/sys/linux/landlock.txt
index 01a62bb4d..7452275f9 100644
--- a/sys/linux/landlock.txt
+++ b/sys/linux/landlock.txt
@@ -28,6 +28,9 @@ landlock_net_port_attr {
 	port		int64
 }
 
+# TODO(glider): remove this line once LANDLOCK_ACCESS_FS_IOCTL_DEV hits upstream.
+define LANDLOCK_ACCESS_FS_IOCTL_DEV	(1ULL << 15)
+
 landlock_access_fs_flags = LANDLOCK_ACCESS_FS_EXECUTE, LANDLOCK_ACCESS_FS_WRITE_FILE, LANDLOCK_ACCESS_FS_READ_FILE, LANDLOCK_ACCESS_FS_READ_DIR, LANDLOCK_ACCESS_FS_REMOVE_DIR, LANDLOCK_ACCESS_FS_REMOVE_FILE, LANDLOCK_ACCESS_FS_MAKE_CHAR, LANDLOCK_ACCESS_FS_MAKE_DIR, LANDLOCK_ACCESS_FS_MAKE_REG, LANDLOCK_ACCESS_FS_MAKE_SOCK, LANDLOCK_ACCESS_FS_MAKE_FIFO, LANDLOCK_ACCESS_FS_MAKE_BLOCK, LANDLOCK_ACCESS_FS_MAKE_SYM, LANDLOCK_ACCESS_FS_REFER, LANDLOCK_ACCESS_FS_TRUNCATE, LANDLOCK_ACCESS_FS_IOCTL_DEV
 
 landlock_access_net_flags = LANDLOCK_ACCESS_NET_BIND_TCP, LANDLOCK_ACCESS_NET_CONNECT_TCP
diff --git a/sys/linux/socket_netlink.txt.const b/sys/linux/socket_netlink.txt.const
index d4ea2a439..6d6cd4a58 100644
--- a/sys/linux/socket_netlink.txt.const
+++ b/sys/linux/socket_netlink.txt.const
@@ -18,7 +18,7 @@ NETLINK_ISCSI = 8
 NETLINK_KOBJECT_UEVENT = 15
 NETLINK_LISTEN_ALL_NSID = 8
 NETLINK_LIST_MEMBERSHIPS = 9
-NETLINK_MAX_ATTRIBUTES = 329
+NETLINK_MAX_ATTRIBUTES = 330
 NETLINK_NETFILTER = 12
 NETLINK_NFLOG = 5
 NETLINK_NO_ENOBUFS = 5
diff --git a/sys/linux/socket_netlink_route.txt b/sys/linux/socket_netlink_route.txt
index 6c3fe41bb..1b9da553e 100644
--- a/sys/linux/socket_netlink_route.txt
+++ b/sys/linux/socket_netlink_route.txt
@@ -1110,6 +1110,12 @@ lwtunnel_policy [
 	RPL_IPTUNNEL_SRH	nlattr[RPL_IPTUNNEL_SRH, ipv6_rpl_sr_hdr]
 ] [varlen]
 
+# 5832c4a77d693 ("ip_tunnel: convert __be16 tunnel flags to bitmaps") put the constants below
+# behind #ifndef __KERNEL__, so they cannot be extracted anymore.
+define TUNNEL_GENEVE_OPT	__cpu_to_be16(0x0800)
+define TUNNEL_VXLAN_OPT	__cpu_to_be16(0x1000)
+define TUNNEL_ERSPAN_OPT	__cpu_to_be16(0x4000)
+
 lwtunnel_ip_flags = TUNNEL_GENEVE_OPT, TUNNEL_VXLAN_OPT, TUNNEL_ERSPAN_OPT
 
 ip_opts_policy [