Update kernel headers

Update kernel headers to commit:
    92de776d2090 ("Merge tag 'mlx5-updates-2023-12-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 313d2557c643eb01d24ed7daa4dccd58a45e0d56..0a2380a1139d460f08c40aaec6829006ad432879 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1074,9 +1074,11 @@ enum bpf_link_type {
        BPF_LINK_TYPE_TCX = 11,
        BPF_LINK_TYPE_UPROBE_MULTI = 12,
        BPF_LINK_TYPE_NETKIT = 13,
-       MAX_BPF_LINK_TYPE,
+       __MAX_BPF_LINK_TYPE,
 };
 
+#define MAX_BPF_LINK_TYPE __MAX_BPF_LINK_TYPE
+
 enum bpf_perf_event_type {
        BPF_PERF_EVENT_UNSPEC = 0,
        BPF_PERF_EVENT_UPROBE = 1,

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index fc554a898c91a73914ee83eec7df91c29bca4687..e77170199815f72a14285992cce084c6bd5d660b 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -139,6 +139,8 @@ enum devlink_command {
        DEVLINK_CMD_SELFTESTS_GET,      /* can dump */
        DEVLINK_CMD_SELFTESTS_RUN,
 
+       DEVLINK_CMD_NOTIFY_FILTER_SET,
+
        /* add new commands above here */
        __DEVLINK_CMD_MAX,
        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index adb75f7db0a21f0aa134d8c7899606db410daec9..c206cf6d9a1edffa5df211d69f8ef4ff772c6078 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -757,6 +757,7 @@ enum {
        MDBE_ATTR_VNI,
        MDBE_ATTR_IFINDEX,
        MDBE_ATTR_SRC_VNI,
+       MDBE_ATTR_STATE_MASK,
        __MDBE_ATTR_MAX,
 };
 #define MDBE_ATTR_MAX (__MDBE_ATTR_MAX - 1)

diff --git a/include/uapi/linux/mptcp_pm.h b/include/uapi/linux/mptcp_pm.h
index 3a4912a2fcc5171d312f3bc897d89726d9aef116..a66f18afad1d163c43234a0e49d553e537a7b8df 100644 (file)
--- a/include/uapi/linux/mptcp_pm.h
+++ b/include/uapi/linux/mptcp_pm.h
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 /* Do not edit directly, auto-generated from: */
-/*     Documentation/netlink/specs/mptcp.yaml */
+/*     Documentation/netlink/specs/mptcp_pm.yaml */
 /* YNL-GEN uapi header */
 
 #ifndef _LINUX_MPTCP_PM_H

diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h
index b3d4a9c170ef1e765243e356c787a7effea47bdf..bf9749dd1422607dd57e1f64b8a39f0b32ab0ede 100644 (file)
--- a/include/uapi/linux/stddef.h
+++ b/include/uapi/linux/stddef.h
@@ -27,7 +27,7 @@
        union { \
                struct { MEMBERS } ATTRS; \
                struct TAG { MEMBERS } ATTRS NAME; \
-       }
+       } ATTRS
 
 #ifdef __cplusplus
 /* sizeof(struct{}) is 1 in C++, not 0, can't use C version of the macro. */

diff --git a/include/uapi/linux/tc_act/tc_mirred.h b/include/uapi/linux/tc_act/tc_mirred.h
index 2500a0005d051b3292df07cd6c8eff94e6b04723..c61e76f3c23b8d46a4a3da076f57c96dd157fac3 100644 (file)
--- a/include/uapi/linux/tc_act/tc_mirred.h
+++ b/include/uapi/linux/tc_act/tc_mirred.h
@@ -21,6 +21,7 @@ enum {
        TCA_MIRRED_TM,
        TCA_MIRRED_PARMS,
        TCA_MIRRED_PAD,
+       TCA_MIRRED_BLOCKID,
        __TCA_MIRRED_MAX
 };
 #define TCA_MIRRED_MAX (__TCA_MIRRED_MAX - 1)