Merge branch 'linus' into smp/hotplug

Apply upstream changes to avoid conflicts with pending patches.

4 files changed, 68 insertions, 4 deletions

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index da218fec6056..9e5fc168c8a3 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -339,7 +339,7 @@ enum bpf_func_id {
         BPF_FUNC_skb_change_type,
 
         /**
-         * bpf_skb_in_cgroup(skb, map, index) - Check cgroup2 membership of skb
+         * bpf_skb_under_cgroup(skb, map, index) - Check cgroup2 membership of skb
          * @skb: pointer to skb
          * @map: pointer to bpf_map in BPF_MAP_TYPE_CGROUP_ARRAY type
          * @index: index of the cgroup in the bpf_map
@@ -348,7 +348,7 @@ enum bpf_func_id {
          *   == 1 skb succeeded the cgroup2 descendant test
          *    < 0 error
          */
-        BPF_FUNC_skb_in_cgroup,
+        BPF_FUNC_skb_under_cgroup,
 
         /**
          * bpf_get_hash_recalc(skb)
diff --git a/include/uapi/linux/netfilter/nf_tables.h b/include/uapi/linux/netfilter/nf_tables.h
index 01751faccaf8..c674ba2563b7 100644
--- a/include/uapi/linux/netfilter/nf_tables.h
+++ b/include/uapi/linux/netfilter/nf_tables.h
@@ -24,7 +24,7 @@ enum nft_registers {
         __NFT_REG_MAX,
 
         NFT_REG32_00    = 8,
-        MFT_REG32_01,
+        NFT_REG32_01,
         NFT_REG32_02,
         NFT_REG32_03,
         NFT_REG32_04,
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index d304f4c9792c..a406adcc0793 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -944,4 +944,68 @@ struct sctp_default_prinfo {
         __u16 pr_policy;
 };
 
+struct sctp_info {
+        __u32   sctpi_tag;
+        __u32   sctpi_state;
+        __u32   sctpi_rwnd;
+        __u16   sctpi_unackdata;
+        __u16   sctpi_penddata;
+        __u16   sctpi_instrms;
+        __u16   sctpi_outstrms;
+        __u32   sctpi_fragmentation_point;
+        __u32   sctpi_inqueue;
+        __u32   sctpi_outqueue;
+        __u32   sctpi_overall_error;
+        __u32   sctpi_max_burst;
+        __u32   sctpi_maxseg;
+        __u32   sctpi_peer_rwnd;
+        __u32   sctpi_peer_tag;
+        __u8    sctpi_peer_capable;
+        __u8    sctpi_peer_sack;
+        __u16   __reserved1;
+
+        /* assoc status info */
+        __u64   sctpi_isacks;
+        __u64   sctpi_osacks;
+        __u64   sctpi_opackets;
+        __u64   sctpi_ipackets;
+        __u64   sctpi_rtxchunks;
+        __u64   sctpi_outofseqtsns;
+        __u64   sctpi_idupchunks;
+        __u64   sctpi_gapcnt;
+        __u64   sctpi_ouodchunks;
+        __u64   sctpi_iuodchunks;
+        __u64   sctpi_oodchunks;
+        __u64   sctpi_iodchunks;
+        __u64   sctpi_octrlchunks;
+        __u64   sctpi_ictrlchunks;
+
+        /* primary transport info */
+        struct sockaddr_storage sctpi_p_address;
+        __s32   sctpi_p_state;
+        __u32   sctpi_p_cwnd;
+        __u32   sctpi_p_srtt;
+        __u32   sctpi_p_rto;
+        __u32   sctpi_p_hbinterval;
+        __u32   sctpi_p_pathmaxrxt;
+        __u32   sctpi_p_sackdelay;
+        __u32   sctpi_p_sackfreq;
+        __u32   sctpi_p_ssthresh;
+        __u32   sctpi_p_partial_bytes_acked;
+        __u32   sctpi_p_flight_size;
+        __u16   sctpi_p_error;
+        __u16   __reserved2;
+
+        /* sctp sock info */
+        __u32   sctpi_s_autoclose;
+        __u32   sctpi_s_adaptation_ind;
+        __u32   sctpi_s_pd_point;
+        __u8    sctpi_s_nodelay;
+        __u8    sctpi_s_disable_fragments;
+        __u8    sctpi_s_v4mapped;
+        __u8    sctpi_s_frag_interleave;
+        __u32   sctpi_s_type;
+        __u32   __reserved3;
+};
+
 #endif /* _UAPI_SCTP_H */
diff --git a/include/uapi/linux/virtio_vsock.h b/include/uapi/linux/virtio_vsock.h
index 6b011c19b50f..1d57ed3d84d2 100644
--- a/include/uapi/linux/virtio_vsock.h
+++ b/include/uapi/linux/virtio_vsock.h
@@ -32,7 +32,7 @@
  */
 
 #ifndef _UAPI_LINUX_VIRTIO_VSOCK_H
-#define _UAPI_LINUX_VIRTIO_VOSCK_H
+#define _UAPI_LINUX_VIRTIO_VSOCK_H
 
 #include <linux/types.h>
 #include <linux/virtio_ids.h>