Update kernel headers

Update kernel headers to commit:
    a65cc8435540 ("Merge branch 'bnxt_en-next'")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 5889a4d30ab3ad4012499fde0c311c89c4ff0472..1fc94c09df3c5e24bd63c3c73c51ae309d01acfd 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -5143,6 +5143,17 @@ union bpf_attr {
  *             The **hash_algo** is returned on success,
  *             **-EOPNOTSUP** if the hash calculation failed or **-EINVAL** if
  *             invalid arguments are passed.
+ *
+ * void *bpf_kptr_xchg(void *map_value, void *ptr)
+ *     Description
+ *             Exchange kptr at pointer *map_value* with *ptr*, and return the
+ *             old value. *ptr* can be NULL, otherwise it must be a referenced
+ *             pointer which will be released when this helper is called.
+ *     Return
+ *             The old value of kptr (which can be NULL). The returned pointer
+ *             if not NULL, is a reference which must be released using its
+ *             corresponding release function, or moved into a BPF map before
+ *             program exit.
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \
@@ -5339,6 +5350,7 @@ union bpf_attr {
        FN(copy_from_user_task),        \
        FN(skb_set_tstamp),             \
        FN(ima_file_hash),              \
+       FN(kptr_xchg),                  \
        /* */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index d8e11112ce582186819bc6435fedf7dd575812c9..da0f1ba8f7a03c12a2b229e85244c9f03b70aea2 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -136,8 +136,6 @@ enum devlink_command {
        DEVLINK_CMD_LINECARD_NEW,
        DEVLINK_CMD_LINECARD_DEL,
 
-       DEVLINK_CMD_LINECARD_INFO_GET,          /* can dump */
-
        /* add new commands above here */
        __DEVLINK_CMD_MAX,
        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -577,9 +575,6 @@ enum devlink_attr {
        DEVLINK_ATTR_LINECARD_STATE,            /* u8 */
        DEVLINK_ATTR_LINECARD_TYPE,             /* string */
        DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES,  /* nested */
-       DEVLINK_ATTR_LINECARD_DEVICE_LIST,      /* nested */
-       DEVLINK_ATTR_LINECARD_DEVICE,           /* nested */
-       DEVLINK_ATTR_LINECARD_DEVICE_INDEX,     /* u32 */
 
        /* add new attributes above here, update the policy in devlink.c */
 

diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
index ca502f1edccfb1f37f8142bbbc17f9d4ca0cb5d6..1e07e2d9587436b5167191d40c06356163fc0a68 100644 (file)
--- a/include/uapi/linux/mptcp.h
+++ b/include/uapi/linux/mptcp.h
@@ -53,6 +53,9 @@ enum {
        MPTCP_PM_ATTR_ADDR,                             /* nested address */
        MPTCP_PM_ATTR_RCV_ADD_ADDRS,                    /* u32 */
        MPTCP_PM_ATTR_SUBFLOWS,                         /* u32 */
+       MPTCP_PM_ATTR_TOKEN,                            /* u32 */
+       MPTCP_PM_ATTR_LOC_ID,                           /* u8 */
+       MPTCP_PM_ATTR_ADDR_REMOTE,                      /* nested address */
 
        __MPTCP_PM_ATTR_MAX
 };
@@ -91,6 +94,10 @@ enum {
        MPTCP_PM_CMD_SET_LIMITS,
        MPTCP_PM_CMD_GET_LIMITS,
        MPTCP_PM_CMD_SET_FLAGS,
+       MPTCP_PM_CMD_ANNOUNCE,
+       MPTCP_PM_CMD_REMOVE,
+       MPTCP_PM_CMD_SUBFLOW_CREATE,
+       MPTCP_PM_CMD_SUBFLOW_DESTROY,
 
        __MPTCP_PM_CMD_AFTER_LAST
 };
@@ -186,6 +193,7 @@ enum mptcp_event_attr {
        MPTCP_ATTR_IF_IDX,      /* s32 */
        MPTCP_ATTR_RESET_REASON,/* u32 */
        MPTCP_ATTR_RESET_FLAGS, /* u32 */
+       MPTCP_ATTR_SERVER_SIDE, /* u8 */
 
        __MPTCP_ATTR_AFTER_LAST
 };

diff --git a/include/uapi/linux/virtio_ids.h b/include/uapi/linux/virtio_ids.h
index 80d76b75bccd9e2f96b20db96189319f9546acd5..7aa2eb76620508fdc915533f74973d76308d3ef5 100644 (file)
--- a/include/uapi/linux/virtio_ids.h
+++ b/include/uapi/linux/virtio_ids.h
@@ -73,12 +73,12 @@
  * Virtio Transitional IDs
  */
 
-#define VIRTIO_TRANS_ID_NET            1000 /* transitional virtio net */
-#define VIRTIO_TRANS_ID_BLOCK          1001 /* transitional virtio block */
-#define VIRTIO_TRANS_ID_BALLOON                1002 /* transitional virtio balloon */
-#define VIRTIO_TRANS_ID_CONSOLE                1003 /* transitional virtio console */
-#define VIRTIO_TRANS_ID_SCSI           1004 /* transitional virtio SCSI */
-#define VIRTIO_TRANS_ID_RNG            1005 /* transitional virtio rng */
-#define VIRTIO_TRANS_ID_9P             1009 /* transitional virtio 9p console */
+#define VIRTIO_TRANS_ID_NET            0x1000 /* transitional virtio net */
+#define VIRTIO_TRANS_ID_BLOCK          0x1001 /* transitional virtio block */
+#define VIRTIO_TRANS_ID_BALLOON                0x1002 /* transitional virtio balloon */
+#define VIRTIO_TRANS_ID_CONSOLE                0x1003 /* transitional virtio console */
+#define VIRTIO_TRANS_ID_SCSI           0x1004 /* transitional virtio SCSI */
+#define VIRTIO_TRANS_ID_RNG            0x1005 /* transitional virtio rng */
+#define VIRTIO_TRANS_ID_9P             0x1009 /* transitional virtio 9p console */
 
 #endif /* _LINUX_VIRTIO_IDS_H */