Update kernel headers

Update kernel headers to commit:
    fe8152b38d3a ("Merge tag 'devprop-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 700f4f7f2d1af622d40e4bfaf074b96b337e5b2c..af474c44a5799326550cc2c0e0374813281dc65f 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -4983,6 +4983,41 @@ union bpf_attr {
  *     Return
  *             The number of loops performed, **-EINVAL** for invalid **flags**,
  *             **-E2BIG** if **nr_loops** exceeds the maximum number of loops.
+ *
+ * long bpf_strncmp(const char *s1, u32 s1_sz, const char *s2)
+ *     Description
+ *             Do strncmp() between **s1** and **s2**. **s1** doesn't need
+ *             to be null-terminated and **s1_sz** is the maximum storage
+ *             size of **s1**. **s2** must be a read-only string.
+ *     Return
+ *             An integer less than, equal to, or greater than zero
+ *             if the first **s1_sz** bytes of **s1** is found to be
+ *             less than, to match, or be greater than **s2**.
+ *
+ * long bpf_get_func_arg(void *ctx, u32 n, u64 *value)
+ *     Description
+ *             Get **n**-th argument (zero based) of the traced function (for tracing programs)
+ *             returned in **value**.
+ *
+ *     Return
+ *             0 on success.
+ *             **-EINVAL** if n >= arguments count of traced function.
+ *
+ * long bpf_get_func_ret(void *ctx, u64 *value)
+ *     Description
+ *             Get return value of the traced function (for tracing programs)
+ *             in **value**.
+ *
+ *     Return
+ *             0 on success.
+ *             **-EOPNOTSUPP** for tracing programs other than BPF_TRACE_FEXIT or BPF_MODIFY_RETURN.
+ *
+ * long bpf_get_func_arg_cnt(void *ctx)
+ *     Description
+ *             Get number of arguments of the traced function (for tracing programs).
+ *
+ *     Return
+ *             The number of arguments of the traced function.
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \
@@ -5167,6 +5202,10 @@ union bpf_attr {
        FN(kallsyms_lookup_name),       \
        FN(find_vma),                   \
        FN(loop),                       \
+       FN(strncmp),                    \
+       FN(get_func_arg),               \
+       FN(get_func_ret),               \
+       FN(get_func_arg_cnt),           \
        /* */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper

diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h
index 5f1054e050efef442f864d6b8fe84b73b13e35b2..8ec98c21eaeeb499f082ce2c0809719e487055b9 100644 (file)
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
@@ -137,6 +137,7 @@ enum {
        IFLA_CAN_DATA_BITRATE_CONST,
        IFLA_CAN_BITRATE_MAX,
        IFLA_CAN_TDC,
+       IFLA_CAN_CTRLMODE_EXT,
 
        /* add new constants above here */
        __IFLA_CAN_MAX,
@@ -166,6 +167,18 @@ enum {
        IFLA_CAN_TDC_MAX = __IFLA_CAN_TDC - 1
 };
 
+/*
+ * IFLA_CAN_CTRLMODE_EXT nest: controller mode extended parameters
+ */
+enum {
+       IFLA_CAN_CTRLMODE_UNSPEC,
+       IFLA_CAN_CTRLMODE_SUPPORTED,    /* u32 */
+
+       /* add new constants above here */
+       __IFLA_CAN_CTRLMODE,
+       IFLA_CAN_CTRLMODE_MAX = __IFLA_CAN_CTRLMODE - 1
+};
+
 /* u16 termination range: 1..65535 Ohms */
 #define CAN_TERMINATION_DISABLED 0
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 9ed264d556f8f0743239e9cf90330ff3ea7dcbd0..41708e26a3c90fd1196b497ada405aaaae85b9db 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -347,6 +347,7 @@ enum {
         */
        IFLA_PARENT_DEV_NAME,
        IFLA_PARENT_DEV_BUS_NAME,
+       IFLA_GRO_MAX_SIZE,
 
        __IFLA_MAX
 };

diff --git a/include/uapi/linux/pfkeyv2.h b/include/uapi/linux/pfkeyv2.h
index d65b117852604ff00ea34ef1e764fa4a63369c94..8abae1f6749c59b10029009bb081fa03bcf71981 100644 (file)
--- a/include/uapi/linux/pfkeyv2.h
+++ b/include/uapi/linux/pfkeyv2.h
@@ -309,6 +309,7 @@ struct sadb_x_filter {
 #define SADB_X_AALG_SHA2_512HMAC       7
 #define SADB_X_AALG_RIPEMD160HMAC      8
 #define SADB_X_AALG_AES_XCBC_MAC       9
+#define SADB_X_AALG_SM3_256HMAC                10
 #define SADB_X_AALG_NULL               251     /* kame */
 #define SADB_AALG_MAX                  251
 
@@ -329,6 +330,7 @@ struct sadb_x_filter {
 #define SADB_X_EALG_AES_GCM_ICV16      20
 #define SADB_X_EALG_CAMELLIACBC                22
 #define SADB_X_EALG_NULL_AES_GMAC      23
+#define SADB_X_EALG_SM4CBC             24
 #define SADB_EALG_MAX                   253 /* last EALG */
 /* private allocations should use 249-255 (RFC2407) */
 #define SADB_X_EALG_SERPENTCBC  252     /* draft-ietf-ipsec-ciph-aes-cbc-00 */

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 6836ccb9c45dcba1e0f9e89061d39a1e2409a28a..ee38b35c3f57e5162ef26cc274d4688fe3a00721 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -19,13 +19,16 @@ enum {
        TCA_ACT_FLAGS,
        TCA_ACT_HW_STATS,
        TCA_ACT_USED_HW_STATS,
+       TCA_ACT_IN_HW_COUNT,
        __TCA_ACT_MAX
 };
 
 /* See other TCA_ACT_FLAGS_ * flags in include/net/act_api.h. */
-#define TCA_ACT_FLAGS_NO_PERCPU_STATS 1 /* Don't use percpu allocator for
-                                        * actions stats.
-                                        */
+#define TCA_ACT_FLAGS_NO_PERCPU_STATS (1 << 0) /* Don't use percpu allocator for
+                                               * actions stats.
+                                               */
+#define TCA_ACT_FLAGS_SKIP_HW  (1 << 1) /* don't offload action to HW */
+#define TCA_ACT_FLAGS_SKIP_SW  (1 << 2) /* don't use action in SW */
 
 /* tca HW stats type
  * When user does not pass the attribute, he does not care.

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index e01efa281bdc0a686a4946a4f4f36166f2f28baa..80bc1040838298e3075ab76a45588e7b2f524cfb 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -752,6 +752,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_NEXTHOP                RTNLGRP_NEXTHOP
        RTNLGRP_BRVLAN,
 #define RTNLGRP_BRVLAN         RTNLGRP_BRVLAN
+       RTNLGRP_MCTP_IFADDR,
+#define RTNLGRP_MCTP_IFADDR    RTNLGRP_MCTP_IFADDR
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)

diff --git a/include/uapi/linux/xfrm.h b/include/uapi/linux/xfrm.h
index 378b4092f26a9ffadf76a504e8f662e1b65f758a..3ffa107c70507fbc069079ab0fb315747dc5e85d 100644 (file)
--- a/include/uapi/linux/xfrm.h
+++ b/include/uapi/linux/xfrm.h
@@ -313,6 +313,7 @@ enum xfrm_attr_type_t {
        XFRMA_SET_MARK,         /* __u32 */
        XFRMA_SET_MARK_MASK,    /* __u32 */
        XFRMA_IF_ID,            /* __u32 */
+       XFRMA_MTIMER_THRESH,    /* __u32 in seconds for input SA */
        __XFRMA_MAX
 
 #define XFRMA_OUTPUT_MARK XFRMA_SET_MARK       /* Compatibility */