147 files changed, 1082 insertions, 868 deletions

diff --git a/include/asm-generic/5level-fixup.h b/include/asm-generic/5level-fixup.h
index bb6cb347018c..f6947da70d71 100644
--- a/include/asm-generic/5level-fixup.h
+++ b/include/asm-generic/5level-fixup.h
@@ -19,9 +19,24 @@
 
 #define p4d_alloc(mm, pgd, address)     (pgd)
 #define p4d_offset(pgd, start)          (pgd)
-#define p4d_none(p4d)                   0
-#define p4d_bad(p4d)                    0
-#define p4d_present(p4d)                1
+
+#ifndef __ASSEMBLY__
+static inline int p4d_none(p4d_t p4d)
+{
+        return 0;
+}
+
+static inline int p4d_bad(p4d_t p4d)
+{
+        return 0;
+}
+
+static inline int p4d_present(p4d_t p4d)
+{
+        return 1;
+}
+#endif
+
 #define p4d_ERROR(p4d)                  do { } while (0)
 #define p4d_clear(p4d)                  pgd_clear(p4d)
 #define p4d_val(p4d)                    pgd_val(p4d)
diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
index 8666fe7f35d7..02970b11f71f 100644
--- a/include/asm-generic/futex.h
+++ b/include/asm-generic/futex.h
@@ -118,26 +118,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
 static inline int
 arch_futex_atomic_op_inuser(int op, u32 oparg, int *oval, u32 __user *uaddr)
 {
-        int oldval = 0, ret;
-
-        pagefault_disable();
-
-        switch (op) {
-        case FUTEX_OP_SET:
-        case FUTEX_OP_ADD:
-        case FUTEX_OP_OR:
-        case FUTEX_OP_ANDN:
-        case FUTEX_OP_XOR:
-        default:
-                ret = -ENOSYS;
-        }
-
-        pagefault_enable();
-
-        if (!ret)
-                *oval = oldval;
-
-        return ret;
+        return -ENOSYS;
 }
 
 static inline int
diff --git a/include/asm-generic/getorder.h b/include/asm-generic/getorder.h
index c64bea7a52be..e9f20b813a69 100644
--- a/include/asm-generic/getorder.h
+++ b/include/asm-generic/getorder.h
@@ -7,24 +7,6 @@
 #include <linux/compiler.h>
 #include <linux/log2.h>
 
-/*
- * Runtime evaluation of get_order()
- */
-static inline __attribute_const__
-int __get_order(unsigned long size)
-{
-        int order;
-
-        size--;
-        size >>= PAGE_SHIFT;
-#if BITS_PER_LONG == 32
-        order = fls(size);
-#else
-        order = fls64(size);
-#endif
-        return order;
-}
-
 /**
  * get_order - Determine the allocation order of a memory size
  * @size: The size for which to get the order
@@ -43,19 +25,27 @@ int __get_order(unsigned long size)
  * to hold an object of the specified size.
  *
  * The result is undefined if the size is 0.
- *
- * This function may be used to initialise variables with compile time
- * evaluations of constants.
  */
-#define get_order(n)                                            \
-(                                                               \
-        __builtin_constant_p(n) ? (                             \
-                ((n) == 0UL) ? BITS_PER_LONG - PAGE_SHIFT :     \
-                (((n) < (1UL << PAGE_SHIFT)) ? 0 :              \
-                 ilog2((n) - 1) - PAGE_SHIFT + 1)               \
-        ) :                                                     \
-        __get_order(n)                                          \
-)
+static inline __attribute_const__ int get_order(unsigned long size)
+{
+        if (__builtin_constant_p(size)) {
+                if (!size)
+                        return BITS_PER_LONG - PAGE_SHIFT;
+
+                if (size < (1UL << PAGE_SHIFT))
+                        return 0;
+
+                return ilog2((size) - 1) - PAGE_SHIFT + 1;
+        }
+
+        size--;
+        size >>= PAGE_SHIFT;
+#if BITS_PER_LONG == 32
+        return fls(size);
+#else
+        return fls64(size);
+#endif
+}
 
 #endif  /* __ASSEMBLY__ */
 
diff --git a/include/drm/drm_client.h b/include/drm/drm_client.h
index 72d51d1e9dd9..5cf2c5dd8b1e 100644
--- a/include/drm/drm_client.h
+++ b/include/drm/drm_client.h
@@ -149,6 +149,8 @@ struct drm_client_buffer {
 struct drm_client_buffer *
 drm_client_framebuffer_create(struct drm_client_dev *client, u32 width, u32 height, u32 format);
 void drm_client_framebuffer_delete(struct drm_client_buffer *buffer);
+void *drm_client_buffer_vmap(struct drm_client_buffer *buffer);
+void drm_client_buffer_vunmap(struct drm_client_buffer *buffer);
 
 int drm_client_modeset_create(struct drm_client_dev *client);
 void drm_client_modeset_free(struct drm_client_dev *client);
diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
index 759d462d028b..f57eea0481e0 100644
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
@@ -853,6 +853,13 @@ struct drm_mode_config {
         uint32_t preferred_depth, prefer_shadow;
 
         /**
+         * @prefer_shadow_fbdev:
+         *
+         * Hint to framebuffer emulation to prefer shadow-fb rendering.
+         */
+        bool prefer_shadow_fbdev;
+
+        /**
          * @quirk_addfb_prefer_xbgr_30bpp:
          *
          * Special hack for legacy ADDFB to keep nouveau userspace happy. Should
diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h
index 16c769a7f979..6db030439e29 100644
--- a/include/kvm/arm_pmu.h
+++ b/include/kvm/arm_pmu.h
@@ -34,6 +34,7 @@ struct kvm_pmu {
 u64 kvm_pmu_get_counter_value(struct kvm_vcpu *vcpu, u64 select_idx);
 void kvm_pmu_set_counter_value(struct kvm_vcpu *vcpu, u64 select_idx, u64 val);
 u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu);
+void kvm_pmu_vcpu_init(struct kvm_vcpu *vcpu);
 void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu);
 void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu);
 void kvm_pmu_disable_counter_mask(struct kvm_vcpu *vcpu, u64 val);
@@ -71,6 +72,7 @@ static inline u64 kvm_pmu_valid_counter_mask(struct kvm_vcpu *vcpu)
 {
         return 0;
 }
+static inline void kvm_pmu_vcpu_init(struct kvm_vcpu *vcpu) {}
 static inline void kvm_pmu_vcpu_reset(struct kvm_vcpu *vcpu) {}
 static inline void kvm_pmu_vcpu_destroy(struct kvm_vcpu *vcpu) {}
 static inline void kvm_pmu_disable_counter_mask(struct kvm_vcpu *vcpu, u64 val) {}
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 46bbc949c20a..7a30524a80ee 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -350,6 +350,7 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu);
 
 void kvm_vgic_load(struct kvm_vcpu *vcpu);
 void kvm_vgic_put(struct kvm_vcpu *vcpu);
+void kvm_vgic_vmcr_sync(struct kvm_vcpu *vcpu);
 
 #define irqchip_in_kernel(k)    (!!((k)->arch.vgic.in_kernel))
 #define vgic_initialized(k)     ((k)->arch.vgic.initialized)
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h
index 689a58231288..12811091fd50 100644
--- a/include/linux/blk-cgroup.h
+++ b/include/linux/blk-cgroup.h
@@ -181,6 +181,7 @@ struct blkcg_policy {
 
 extern struct blkcg blkcg_root;
 extern struct cgroup_subsys_state * const blkcg_root_css;
+extern bool blkcg_debug_stats;
 
 struct blkcg_gq *blkg_lookup_slowpath(struct blkcg *blkcg,
                                       struct request_queue *q, bool update_hint);
diff --git a/include/linux/ccp.h b/include/linux/ccp.h
index 55cb455cfcb0..a5dfbaf2470d 100644
--- a/include/linux/ccp.h
+++ b/include/linux/ccp.h
@@ -170,6 +170,8 @@ struct ccp_aes_engine {
         enum ccp_aes_mode mode;
         enum ccp_aes_action action;
 
+        u32 authsize;
+
         struct scatterlist *key;
         u32 key_len;            /* In bytes */
 
diff --git a/include/linux/ceph/buffer.h b/include/linux/ceph/buffer.h
index 5e58bb29b1a3..11cdc7c60480 100644
--- a/include/linux/ceph/buffer.h
+++ b/include/linux/ceph/buffer.h
@@ -30,7 +30,8 @@ static inline struct ceph_buffer *ceph_buffer_get(struct ceph_buffer *b)
 
 static inline void ceph_buffer_put(struct ceph_buffer *b)
 {
-        kref_put(&b->kref, ceph_buffer_release);
+        if (b)
+                kref_put(&b->kref, ceph_buffer_release);
 }
 
 extern int ceph_decode_buffer(struct ceph_buffer **b, void **p, void *end);
diff --git a/include/linux/clk.h b/include/linux/clk.h
index 3c096c7a51dc..853a8f181394 100644
--- a/include/linux/clk.h
+++ b/include/linux/clk.h
@@ -359,6 +359,7 @@ int __must_check devm_clk_bulk_get(struct device *dev, int num_clks,
 /**
  * devm_clk_bulk_get_optional - managed get multiple optional consumer clocks
  * @dev: device for clock "consumer"
+ * @num_clks: the number of clk_bulk_data
  * @clks: pointer to the clk_bulk_data table of consumer
  *
  * Behaves the same as devm_clk_bulk_get() except where there is no clock
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index f0fd5636fddb..5e88e7e33abe 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -24,7 +24,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
                         long ______r;                                   \
                         static struct ftrace_likely_data                \
                                 __aligned(4)                            \
-                                __section("_ftrace_annotated_branch")   \
+                                __section(_ftrace_annotated_branch)     \
                                 ______f = {                             \
                                 .data.func = __func__,                  \
                                 .data.file = __FILE__,                  \
@@ -60,7 +60,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
 #define __trace_if_value(cond) ({                       \
         static struct ftrace_branch_data                \
                 __aligned(4)                            \
-                __section("_ftrace_branch")             \
+                __section(_ftrace_branch)               \
                 __if_trace = {                          \
                         .func = __func__,               \
                         .file = __FILE__,               \
@@ -118,7 +118,7 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val,
         ".popsection\n\t"
 
 /* Annotate a C jump table to allow objtool to follow the code flow */
-#define __annotate_jump_table __section(".rodata..c_jump_table")
+#define __annotate_jump_table __section(.rodata..c_jump_table)
 
 #else
 #define annotate_reachable()
@@ -298,7 +298,7 @@ unsigned long read_word_at_a_time(const void *addr)
  * visible to the compiler.
  */
 #define __ADDRESSABLE(sym) \
-        static void * __section(".discard.addressable") __used \
+        static void * __section(.discard.addressable) __used \
                 __PASTE(__addressable_##sym, __LINE__) = (void *)&sym;
 
 /**
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 6b6c7396a584..cb732643471b 100644
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -50,7 +50,6 @@ struct cn_dev {
 
         u32 seq, groups;
         struct sock *nls;
-        void (*input) (struct sk_buff *skb);
 
         struct cn_queue_dev *cbdev;
 };
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 7eb43a038330..f7a30e0099be 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -145,7 +145,11 @@ struct cred {
         struct user_struct *user;       /* real user ID subscription */
         struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
         struct group_info *group_info;  /* supplementary groups for euid/fsgid */
-        struct rcu_head rcu;            /* RCU deletion hook */
+        /* RCU deletion */
+        union {
+                int non_rcu;                    /* Can we skip RCU deletion? */
+                struct rcu_head rcu;            /* RCU deletion hook */
+        };
 } __randomize_layout;
 
 extern void __put_cred(struct cred *);
@@ -246,6 +250,7 @@ static inline const struct cred *get_cred(const struct cred *cred)
         if (!cred)
                 return cred;
         validate_creds(cred);
+        nonconst_cred->non_rcu = 0;
         return get_new_cred(nonconst_cred);
 }
 
@@ -257,6 +262,7 @@ static inline const struct cred *get_cred_rcu(const struct cred *cred)
         if (!atomic_inc_not_zero(&nonconst_cred->usage))
                 return NULL;
         validate_creds(cred);
+        nonconst_cred->non_rcu = 0;
         return cred;
 }
 
diff --git a/include/linux/device.h b/include/linux/device.h
index c330b75c6c57..6717adee33f0 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -915,6 +915,8 @@ struct dev_links_info {
  *              This identifies the device type and carries type-specific
  *              information.
  * @mutex:      Mutex to synchronize calls to its driver.
+ * @lockdep_mutex: An optional debug lock that a subsystem can use as a
+ *              peer lock to gain localized lockdep coverage of the device_lock.
  * @bus:        Type of bus device is on.
  * @driver:     Which driver has allocated this
  * @platform_data: Platform data specific to the device.
@@ -998,6 +1000,9 @@ struct device {
                                            core doesn't touch it */
         void            *driver_data;   /* Driver data, set and get with
                                            dev_set_drvdata/dev_get_drvdata */
+#ifdef CONFIG_PROVE_LOCKING
+        struct mutex            lockdep_mutex;
+#endif
         struct mutex            mutex;  /* mutex to synchronize calls to
                                          * its driver.
                                          */
@@ -1383,6 +1388,7 @@ extern int (*platform_notify_remove)(struct device *dev);
  */
 extern struct device *get_device(struct device *dev);
 extern void put_device(struct device *dev);
+extern bool kill_device(struct device *dev);
 
 #ifdef CONFIG_DEVTMPFS
 extern int devtmpfs_create_node(struct device *dev);
diff --git a/include/linux/dim.h b/include/linux/dim.h
index d3a0fbfff2bb..9fa4b3f88c39 100644
--- a/include/linux/dim.h
+++ b/include/linux/dim.h
@@ -272,62 +272,6 @@ dim_update_sample_with_comps(u16 event_ctr, u64 packets, u64 bytes, u64 comps,
 
 /* Net DIM */
 
-/*
- * Net DIM profiles:
- *        There are different set of profiles for each CQ period mode.
- *        There are different set of profiles for RX/TX CQs.
- *        Each profile size must be of NET_DIM_PARAMS_NUM_PROFILES
- */
-#define NET_DIM_PARAMS_NUM_PROFILES 5
-#define NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE 256
-#define NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE 128
-#define NET_DIM_DEF_PROFILE_CQE 1
-#define NET_DIM_DEF_PROFILE_EQE 1
-
-#define NET_DIM_RX_EQE_PROFILES { \
-        {1,   NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
-        {8,   NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
-        {64,  NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
-        {128, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
-        {256, NET_DIM_DEFAULT_RX_CQ_MODERATION_PKTS_FROM_EQE}, \
-}
-
-#define NET_DIM_RX_CQE_PROFILES { \
-        {2,  256},             \
-        {8,  128},             \
-        {16, 64},              \
-        {32, 64},              \
-        {64, 64}               \
-}
-
-#define NET_DIM_TX_EQE_PROFILES { \
-        {1,   NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \
-        {8,   NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \
-        {32,  NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \
-        {64,  NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE},  \
-        {128, NET_DIM_DEFAULT_TX_CQ_MODERATION_PKTS_FROM_EQE}   \
-}
-
-#define NET_DIM_TX_CQE_PROFILES { \
-        {5,  128},  \
-        {8,  64},  \
-        {16, 32},  \
-        {32, 32},  \
-        {64, 32}   \
-}
-
-static const struct dim_cq_moder
-rx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
-        NET_DIM_RX_EQE_PROFILES,
-        NET_DIM_RX_CQE_PROFILES,
-};
-
-static const struct dim_cq_moder
-tx_profile[DIM_CQ_PERIOD_NUM_MODES][NET_DIM_PARAMS_NUM_PROFILES] = {
-        NET_DIM_TX_EQE_PROFILES,
-        NET_DIM_TX_CQE_PROFILES,
-};
-
 /**
  *      net_dim_get_rx_moderation - provide a CQ moderation object for the given RX profile
  *      @cq_period_mode: CQ period mode
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h
index c05d4e661489..03f8e98e3bcc 100644
--- a/include/linux/dma-contiguous.h
+++ b/include/linux/dma-contiguous.h
@@ -160,10 +160,7 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages,
 static inline struct page *dma_alloc_contiguous(struct device *dev, size_t size,
                 gfp_t gfp)
 {
-        int node = dev ? dev_to_node(dev) : NUMA_NO_NODE;
-        size_t align = get_order(PAGE_ALIGN(size));
-
-        return alloc_pages_node(node, gfp, align);
+        return NULL;
 }
 
 static inline void dma_free_contiguous(struct device *dev, struct page *page,
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index e11b115dd0e4..f7d1eea32c78 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -689,8 +689,8 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask)
  */
 static inline bool dma_addressing_limited(struct device *dev)
 {
-        return min_not_zero(*dev->dma_mask, dev->bus_dma_mask) <
-                dma_get_required_mask(dev);
+        return min_not_zero(dma_get_mask(dev), dev->bus_dma_mask) <
+                            dma_get_required_mask(dev);
 }
 
 #ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS
diff --git a/include/linux/dma-noncoherent.h b/include/linux/dma-noncoherent.h
index 3813211a9aad..0bff3d7fac92 100644
--- a/include/linux/dma-noncoherent.h
+++ b/include/linux/dma-noncoherent.h
@@ -42,13 +42,18 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,
                 dma_addr_t dma_addr, unsigned long attrs);
 long arch_dma_coherent_to_pfn(struct device *dev, void *cpu_addr,
                 dma_addr_t dma_addr);
-
-#ifdef CONFIG_ARCH_HAS_DMA_MMAP_PGPROT
 pgprot_t arch_dma_mmap_pgprot(struct device *dev, pgprot_t prot,
                 unsigned long attrs);
+
+#ifdef CONFIG_MMU
+pgprot_t dma_pgprot(struct device *dev, pgprot_t prot, unsigned long attrs);
 #else
-# define arch_dma_mmap_pgprot(dev, prot, attrs) pgprot_noncached(prot)
-#endif
+static inline pgprot_t dma_pgprot(struct device *dev, pgprot_t prot,
+                unsigned long attrs)
+{
+        return prot;    /* no protection bits supported without page tables */
+}
+#endif /* CONFIG_MMU */
 
 #ifdef CONFIG_DMA_NONCOHERENT_CACHE_SYNC
 void arch_dma_cache_sync(struct device *dev, void *vaddr, size_t size,
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 17cd0078377c..1dd014c9c87b 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -45,7 +45,6 @@ struct elevator_mq_ops {
         struct request *(*dispatch_request)(struct blk_mq_hw_ctx *);
         bool (*has_work)(struct blk_mq_hw_ctx *);
         void (*completed_request)(struct request *, u64);
-        void (*started_request)(struct request *);
         void (*requeue_request)(struct request *);
         struct request *(*former_request)(struct request_queue *, struct request *);
         struct request *(*next_request)(struct request_queue *, struct request *);
diff --git a/include/linux/filter.h b/include/linux/filter.h
index ff65d22cf336..92c6e31fb008 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -24,6 +24,7 @@
 
 #include <net/sch_generic.h>
 
+#include <asm/byteorder.h>
 #include <uapi/linux/filter.h>
 #include <uapi/linux/bpf.h>
 
@@ -747,6 +748,18 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default)
         return size <= size_default && (size & (size - 1)) == 0;
 }
 
+static inline u8
+bpf_ctx_narrow_load_shift(u32 off, u32 size, u32 size_default)
+{
+        u8 load_off = off & (size_default - 1);
+
+#ifdef __LITTLE_ENDIAN
+        return load_off * 8;
+#else
+        return (size_default - (load_off + size)) * 8;
+#endif
+}
+
 #define bpf_ctx_wide_access_ok(off, size, type, field)                  \
         (size == sizeof(__u64) &&                                       \
         off >= offsetof(type, field) &&                                 \
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 56b8e358af5c..997a530ff4e9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2598,6 +2598,12 @@ extern struct block_device *blkdev_get_by_path(const char *path, fmode_t mode,
                                                void *holder);
 extern struct block_device *blkdev_get_by_dev(dev_t dev, fmode_t mode,
                                               void *holder);
+extern struct block_device *bd_start_claiming(struct block_device *bdev,
+                                              void *holder);
+extern void bd_finish_claiming(struct block_device *bdev,
+                               struct block_device *whole, void *holder);
+extern void bd_abort_claiming(struct block_device *bdev,
+                              struct block_device *whole, void *holder);
 extern void blkdev_put(struct block_device *bdev, fmode_t mode);
 extern int __blkdev_reread_part(struct block_device *bdev);
 extern int blkdev_reread_part(struct block_device *bdev);
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index fb07b503dc45..f33881688f42 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -510,22 +510,18 @@ alloc_pages(gfp_t gfp_mask, unsigned int order)
 }
 extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,
                         struct vm_area_struct *vma, unsigned long addr,
-                        int node, bool hugepage);
-#define alloc_hugepage_vma(gfp_mask, vma, addr, order) \
-        alloc_pages_vma(gfp_mask, order, vma, addr, numa_node_id(), true)
+                        int node);
 #else
 #define alloc_pages(gfp_mask, order) \
                 alloc_pages_node(numa_node_id(), gfp_mask, order)
-#define alloc_pages_vma(gfp_mask, order, vma, addr, node, false)\
-        alloc_pages(gfp_mask, order)
-#define alloc_hugepage_vma(gfp_mask, vma, addr, order) \
+#define alloc_pages_vma(gfp_mask, order, vma, addr, node)\
         alloc_pages(gfp_mask, order)
 #endif
 #define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0)
 #define alloc_page_vma(gfp_mask, vma, addr)                     \
-        alloc_pages_vma(gfp_mask, 0, vma, addr, numa_node_id(), false)
+        alloc_pages_vma(gfp_mask, 0, vma, addr, numa_node_id())
 #define alloc_page_vma_node(gfp_mask, vma, addr, node)          \
-        alloc_pages_vma(gfp_mask, 0, vma, addr, node, false)
+        alloc_pages_vma(gfp_mask, 0, vma, addr, node)
 
 extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);
 extern unsigned long get_zeroed_page(gfp_t gfp_mask);
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
index 40915b461f18..f757a58191a6 100644
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
@@ -241,30 +241,6 @@ static inline int irq_to_gpio(unsigned irq)
         return -EINVAL;
 }
 
-static inline int
-gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-                       unsigned int gpio_offset, unsigned int pin_offset,
-                       unsigned int npins)
-{
-        WARN_ON(1);
-        return -EINVAL;
-}
-
-static inline int
-gpiochip_add_pingroup_range(struct gpio_chip *chip,
-                        struct pinctrl_dev *pctldev,
-                        unsigned int gpio_offset, const char *pin_group)
-{
-        WARN_ON(1);
-        return -EINVAL;
-}
-
-static inline void
-gpiochip_remove_pin_ranges(struct gpio_chip *chip)
-{
-        WARN_ON(1);
-}
-
 static inline int devm_gpio_request(struct device *dev, unsigned gpio,
                                     const char *label)
 {
diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h
index 9ddcf50a3c59..a7f08fb0f865 100644
--- a/include/linux/gpio/consumer.h
+++ b/include/linux/gpio/consumer.h
@@ -247,7 +247,7 @@ static inline void gpiod_put(struct gpio_desc *desc)
         might_sleep();
 
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
 }
 
 static inline void devm_gpiod_unhinge(struct device *dev,
@@ -256,7 +256,7 @@ static inline void devm_gpiod_unhinge(struct device *dev,
         might_sleep();
 
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
 }
 
 static inline void gpiod_put_array(struct gpio_descs *descs)
@@ -264,7 +264,7 @@ static inline void gpiod_put_array(struct gpio_descs *descs)
         might_sleep();
 
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(descs);
 }
 
 static inline struct gpio_desc *__must_check
@@ -317,7 +317,7 @@ static inline void devm_gpiod_put(struct device *dev, struct gpio_desc *desc)
         might_sleep();
 
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
 }
 
 static inline void devm_gpiod_put_array(struct device *dev,
@@ -326,32 +326,32 @@ static inline void devm_gpiod_put_array(struct device *dev,
         might_sleep();
 
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(descs);
 }
 
 
 static inline int gpiod_get_direction(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -ENOSYS;
 }
 static inline int gpiod_direction_input(struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -ENOSYS;
 }
 static inline int gpiod_direction_output(struct gpio_desc *desc, int value)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -ENOSYS;
 }
 static inline int gpiod_direction_output_raw(struct gpio_desc *desc, int value)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -ENOSYS;
 }
 
@@ -359,7 +359,7 @@ static inline int gpiod_direction_output_raw(struct gpio_desc *desc, int value)
 static inline int gpiod_get_value(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return 0;
 }
 static inline int gpiod_get_array_value(unsigned int array_size,
@@ -368,13 +368,13 @@ static inline int gpiod_get_array_value(unsigned int array_size,
                                         unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 static inline void gpiod_set_value(struct gpio_desc *desc, int value)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
 }
 static inline int gpiod_set_array_value(unsigned int array_size,
                                         struct gpio_desc **desc_array,
@@ -382,13 +382,13 @@ static inline int gpiod_set_array_value(unsigned int array_size,
                                         unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 static inline int gpiod_get_raw_value(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return 0;
 }
 static inline int gpiod_get_raw_array_value(unsigned int array_size,
@@ -397,13 +397,13 @@ static inline int gpiod_get_raw_array_value(unsigned int array_size,
                                             unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 static inline void gpiod_set_raw_value(struct gpio_desc *desc, int value)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
 }
 static inline int gpiod_set_raw_array_value(unsigned int array_size,
                                             struct gpio_desc **desc_array,
@@ -411,14 +411,14 @@ static inline int gpiod_set_raw_array_value(unsigned int array_size,
                                             unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 
 static inline int gpiod_get_value_cansleep(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return 0;
 }
 static inline int gpiod_get_array_value_cansleep(unsigned int array_size,
@@ -427,13 +427,13 @@ static inline int gpiod_get_array_value_cansleep(unsigned int array_size,
                                      unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 static inline void gpiod_set_value_cansleep(struct gpio_desc *desc, int value)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
 }
 static inline int gpiod_set_array_value_cansleep(unsigned int array_size,
                                             struct gpio_desc **desc_array,
@@ -441,13 +441,13 @@ static inline int gpiod_set_array_value_cansleep(unsigned int array_size,
                                             unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 static inline int gpiod_get_raw_value_cansleep(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return 0;
 }
 static inline int gpiod_get_raw_array_value_cansleep(unsigned int array_size,
@@ -456,14 +456,14 @@ static inline int gpiod_get_raw_array_value_cansleep(unsigned int array_size,
                                                unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 static inline void gpiod_set_raw_value_cansleep(struct gpio_desc *desc,
                                                 int value)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
 }
 static inline int gpiod_set_raw_array_value_cansleep(unsigned int array_size,
                                                 struct gpio_desc **desc_array,
@@ -471,41 +471,41 @@ static inline int gpiod_set_raw_array_value_cansleep(unsigned int array_size,
                                                 unsigned long *value_bitmap)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc_array);
         return 0;
 }
 
 static inline int gpiod_set_debounce(struct gpio_desc *desc, unsigned debounce)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -ENOSYS;
 }
 
 static inline int gpiod_set_transitory(struct gpio_desc *desc, bool transitory)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -ENOSYS;
 }
 
 static inline int gpiod_is_active_low(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return 0;
 }
 static inline int gpiod_cansleep(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return 0;
 }
 
 static inline int gpiod_to_irq(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -EINVAL;
 }
 
@@ -513,7 +513,7 @@ static inline int gpiod_set_consumer_name(struct gpio_desc *desc,
                                           const char *name)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -EINVAL;
 }
 
@@ -525,7 +525,7 @@ static inline struct gpio_desc *gpio_to_desc(unsigned gpio)
 static inline int desc_to_gpio(const struct gpio_desc *desc)
 {
         /* GPIO can never have been requested */
-        WARN_ON(1);
+        WARN_ON(desc);
         return -EINVAL;
 }
 
diff --git a/include/linux/hmm.h b/include/linux/hmm.h
index b8a08b2a10ca..7ef56dc18050 100644
--- a/include/linux/hmm.h
+++ b/include/linux/hmm.h
@@ -484,60 +484,6 @@ long hmm_range_dma_unmap(struct hmm_range *range,
  */
 #define HMM_RANGE_DEFAULT_TIMEOUT 1000
 
-/* This is a temporary helper to avoid merge conflict between trees. */
-static inline bool hmm_vma_range_done(struct hmm_range *range)
-{
-        bool ret = hmm_range_valid(range);
-
-        hmm_range_unregister(range);
-        return ret;
-}
-
-/* This is a temporary helper to avoid merge conflict between trees. */
-static inline int hmm_vma_fault(struct hmm_mirror *mirror,
-                                struct hmm_range *range, bool block)
-{
-        long ret;
-
-        /*
-         * With the old API the driver must set each individual entries with
-         * the requested flags (valid, write, ...). So here we set the mask to
-         * keep intact the entries provided by the driver and zero out the
-         * default_flags.
-         */
-        range->default_flags = 0;
-        range->pfn_flags_mask = -1UL;
-
-        ret = hmm_range_register(range, mirror,
-                                 range->start, range->end,
-                                 PAGE_SHIFT);
-        if (ret)
-                return (int)ret;
-
-        if (!hmm_range_wait_until_valid(range, HMM_RANGE_DEFAULT_TIMEOUT)) {
-                /*
-                 * The mmap_sem was taken by driver we release it here and
-                 * returns -EAGAIN which correspond to mmap_sem have been
-                 * drop in the old API.
-                 */
-                up_read(&range->vma->vm_mm->mmap_sem);
-                return -EAGAIN;
-        }
-
-        ret = hmm_range_fault(range, block);
-        if (ret <= 0) {
-                if (ret == -EBUSY || !ret) {
-                        /* Same as above, drop mmap_sem to match old API. */
-                        up_read(&range->vma->vm_mm->mmap_sem);
-                        ret = -EBUSY;
-                } else if (ret == -EAGAIN)
-                        ret = -EBUSY;
-                hmm_range_unregister(range);
-                return ret;
-        }
-        return 0;
-}
-
 /* Below are for HMM internal use only! Not to be used by device driver! */
 static inline void hmm_mm_init(struct mm_struct *mm)
 {
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 8b728750a625..69e813bcb947 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -80,6 +80,9 @@ extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
 extern void unregister_pppox_proto(int proto_num);
 extern void pppox_unbind_sock(struct sock *sk);/* delete ppp-channel binding */
 extern int pppox_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
+extern int pppox_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
+
+#define PPPOEIOCSFWD32    _IOW(0xB1 ,0, compat_size_t)
 
 /* PPPoX socket states */
 enum {
diff --git a/include/linux/if_rmnet.h b/include/linux/if_rmnet.h
index b4f5403383fc..9661416a9bb4 100644
--- a/include/linux/if_rmnet.h
+++ b/include/linux/if_rmnet.h
@@ -41,11 +41,11 @@ struct rmnet_map_ul_csum_header {
         __be16 csum_start_offset;
 #if defined(__LITTLE_ENDIAN_BITFIELD)
         u16 csum_insert_offset:14;
-        u16 udp_ip4_ind:1;
+        u16 udp_ind:1;
         u16 csum_enabled:1;
 #elif defined (__BIG_ENDIAN_BITFIELD)
         u16 csum_enabled:1;
-        u16 udp_ip4_ind:1;
+        u16 udp_ind:1;
         u16 csum_insert_offset:14;
 #else
 #error  "Please fix <asm/byteorder.h>"
diff --git a/include/linux/input/elan-i2c-ids.h b/include/linux/input/elan-i2c-ids.h
index ceabb01a6a7d..1ecb6b45812c 100644
--- a/include/linux/input/elan-i2c-ids.h
+++ b/include/linux/input/elan-i2c-ids.h
@@ -48,7 +48,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
         { "ELAN0618", 0 },
         { "ELAN0619", 0 },
         { "ELAN061A", 0 },
-        { "ELAN061B", 0 },
+/*      { "ELAN061B", 0 }, not working on the Lenovo Legion Y7000 */
         { "ELAN061C", 0 },
         { "ELAN061D", 0 },
         { "ELAN061E", 0 },
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
index f2ae8a006ff8..4fc6454f7ebb 100644
--- a/include/linux/intel-iommu.h
+++ b/include/linux/intel-iommu.h
@@ -346,7 +346,6 @@ enum {
 #define QI_PC_PASID_SEL         (QI_PC_TYPE | QI_PC_GRAN(1))
 
 #define QI_EIOTLB_ADDR(addr)    ((u64)(addr) & VTD_PAGE_MASK)
-#define QI_EIOTLB_GL(gl)        (((u64)gl) << 7)
 #define QI_EIOTLB_IH(ih)        (((u64)ih) << 6)
 #define QI_EIOTLB_AM(am)        (((u64)am))
 #define QI_EIOTLB_PASID(pasid)  (((u64)pasid) << 32)
@@ -378,8 +377,6 @@ enum {
 #define QI_RESP_INVALID         0x1
 #define QI_RESP_FAILURE         0xf
 
-#define QI_GRAN_ALL_ALL                 0
-#define QI_GRAN_NONG_ALL                1
 #define QI_GRAN_NONG_PASID              2
 #define QI_GRAN_PSI_PASID               3
 
diff --git a/include/linux/iova.h b/include/linux/iova.h
index 781b96ac706f..a0637abffee8 100644
--- a/include/linux/iova.h
+++ b/include/linux/iova.h
@@ -155,6 +155,7 @@ struct iova *reserve_iova(struct iova_domain *iovad, unsigned long pfn_lo,
 void copy_reserved_iova(struct iova_domain *from, struct iova_domain *to);
 void init_iova_domain(struct iova_domain *iovad, unsigned long granule,
         unsigned long start_pfn);
+bool has_iova_flush_queue(struct iova_domain *iovad);
 int init_iova_flush_queue(struct iova_domain *iovad,
                           iova_flush_cb flush_cb, iova_entry_dtor entry_dtor);
 struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn);
@@ -235,6 +236,11 @@ static inline void init_iova_domain(struct iova_domain *iovad,
 {
 }
 
+static inline bool has_iova_flush_queue(struct iova_domain *iovad)
+{
+        return false;
+}
+
 static inline int init_iova_flush_queue(struct iova_domain *iovad,
                                         iova_flush_cb flush_cb,
                                         iova_entry_dtor entry_dtor)
diff --git a/include/linux/key.h b/include/linux/key.h
index 91f391cd272e..50028338a4cc 100644
--- a/include/linux/key.h
+++ b/include/linux/key.h
@@ -94,11 +94,11 @@ struct keyring_index_key {
         union {
                 struct {
 #ifdef __LITTLE_ENDIAN /* Put desc_len at the LSB of x */
-                        u8      desc_len;
-                        char    desc[sizeof(long) - 1]; /* First few chars of description */
+                        u16     desc_len;
+                        char    desc[sizeof(long) - 2]; /* First few chars of description */
 #else
-                        char    desc[sizeof(long) - 1]; /* First few chars of description */
-                        u8      desc_len;
+                        char    desc[sizeof(long) - 2]; /* First few chars of description */
+                        u16     desc_len;
 #endif
                 };
                 unsigned long x;
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 5c5b5867024c..fcb46b3374c6 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -861,8 +861,9 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu);
 void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu);
 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu);
 
-bool kvm_arch_has_vcpu_debugfs(void);
-int kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu);
+#ifdef __KVM_HAVE_ARCH_VCPU_DEBUGFS
+void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu);
+#endif
 
 int kvm_arch_hardware_enable(void);
 void kvm_arch_hardware_disable(void);
@@ -872,6 +873,7 @@ int kvm_arch_check_processor_compat(void);
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
 bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu);
 int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
+bool kvm_arch_dy_runnable(struct kvm_vcpu *vcpu);
 
 #ifndef __KVM_HAVE_ARCH_VM_ALLOC
 /*
diff --git a/include/linux/logic_pio.h b/include/linux/logic_pio.h
index cbd9d8495690..88e1e6304a71 100644
--- a/include/linux/logic_pio.h
+++ b/include/linux/logic_pio.h
@@ -117,6 +117,7 @@ struct logic_pio_hwaddr *find_io_range_by_fwnode(struct fwnode_handle *fwnode);
 unsigned long logic_pio_trans_hwaddr(struct fwnode_handle *fwnode,
                         resource_size_t hw_addr, resource_size_t size);
 int logic_pio_register_range(struct logic_pio_hwaddr *newrange);
+void logic_pio_unregister_range(struct logic_pio_hwaddr *range);
 resource_size_t logic_pio_to_hwaddr(unsigned long pio);
 unsigned long logic_pio_trans_cpuaddr(resource_size_t hw_addr);
 
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 44c41462be33..2cd4359cb38c 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -668,6 +668,7 @@ static inline unsigned long lruvec_page_state_local(struct lruvec *lruvec,
 
 void __mod_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx,
                         int val);
+void __mod_lruvec_slab_state(void *p, enum node_stat_item idx, int val);
 
 static inline void mod_lruvec_state(struct lruvec *lruvec,
                                     enum node_stat_item idx, int val)
@@ -1072,6 +1073,14 @@ static inline void mod_lruvec_page_state(struct page *page,
         mod_node_page_state(page_pgdat(page), idx, val);
 }
 
+static inline void __mod_lruvec_slab_state(void *p, enum node_stat_item idx,
+                                           int val)
+{
+        struct page *page = virt_to_head_page(p);
+
+        __mod_node_page_state(page_pgdat(page), idx, val);
+}
+
 static inline
 unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order,
                                             gfp_t gfp_mask,
@@ -1159,6 +1168,16 @@ static inline void __dec_lruvec_page_state(struct page *page,
         __mod_lruvec_page_state(page, idx, -1);
 }
 
+static inline void __inc_lruvec_slab_state(void *p, enum node_stat_item idx)
+{
+        __mod_lruvec_slab_state(p, idx, 1);
+}
+
+static inline void __dec_lruvec_slab_state(void *p, enum node_stat_item idx)
+{
+        __mod_lruvec_slab_state(p, idx, -1);
+}
+
 /* idx can be of type enum memcg_stat_item or node_stat_item */
 static inline void inc_memcg_state(struct mem_cgroup *memcg,
                                    int idx)
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
index 5228c62af416..bac395f1d00a 100644
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
@@ -139,6 +139,8 @@ struct mempolicy *mpol_shared_policy_lookup(struct shared_policy *sp,
 struct mempolicy *get_task_policy(struct task_struct *p);
 struct mempolicy *__get_vma_policy(struct vm_area_struct *vma,
                 unsigned long addr);
+struct mempolicy *get_vma_policy(struct vm_area_struct *vma,
+                                                unsigned long addr);
 bool vma_policy_mof(struct vm_area_struct *vma);
 
 extern void numa_default_policy(void);
diff --git a/include/linux/mlx5/device.h b/include/linux/mlx5/device.h
index ce9839c8bc1a..c2f056b5766d 100644
--- a/include/linux/mlx5/device.h
+++ b/include/linux/mlx5/device.h
@@ -446,11 +446,11 @@ enum {
 };
 
 enum {
-        MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS = 0x20,
+        MLX5_OPC_MOD_TLS_TIS_STATIC_PARAMS = 0x1,
 };
 
 enum {
-        MLX5_OPC_MOD_TLS_TIS_PROGRESS_PARAMS = 0x20,
+        MLX5_OPC_MOD_TLS_TIS_PROGRESS_PARAMS = 0x1,
 };
 
 enum {
diff --git a/include/linux/mlx5/fs.h b/include/linux/mlx5/fs.h
index 04a569568eac..f049af3f3cd8 100644
--- a/include/linux/mlx5/fs.h
+++ b/include/linux/mlx5/fs.h
@@ -220,6 +220,7 @@ int mlx5_modify_rule_destination(struct mlx5_flow_handle *handler,
 
 struct mlx5_fc *mlx5_fc_create(struct mlx5_core_dev *dev, bool aging);
 void mlx5_fc_destroy(struct mlx5_core_dev *dev, struct mlx5_fc *counter);
+u64 mlx5_fc_query_lastuse(struct mlx5_fc *counter);
 void mlx5_fc_query_cached(struct mlx5_fc *counter,
                           u64 *bytes, u64 *packets, u64 *lastuse);
 int mlx5_fc_query(struct mlx5_core_dev *dev, struct mlx5_fc *counter,
diff --git a/include/linux/mlx5/mlx5_ifc.h b/include/linux/mlx5/mlx5_ifc.h
index b3d5752657d9..b8b570c30b5e 100644
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
@@ -5975,10 +5975,12 @@ struct mlx5_ifc_modify_cq_in_bits {
 
         struct mlx5_ifc_cqc_bits cq_context;
 
-        u8         reserved_at_280[0x40];
+        u8         reserved_at_280[0x60];
 
         u8         cq_umem_valid[0x1];
-        u8         reserved_at_2c1[0x5bf];
+        u8         reserved_at_2e1[0x1f];
+
+        u8         reserved_at_300[0x580];
 
         u8         pas[0][0x40];
 };
@@ -10052,9 +10054,8 @@ struct mlx5_ifc_tls_static_params_bits {
 };
 
 struct mlx5_ifc_tls_progress_params_bits {
-        u8         valid[0x1];
-        u8         reserved_at_1[0x7];
-        u8         pd[0x18];
+        u8         reserved_at_0[0x8];
+        u8         tisn[0x18];
 
         u8         next_record_tcp_sn[0x20];
 
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 3a37a89eb7a7..6a7a1083b6fb 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -159,7 +159,16 @@ struct page {
                         /** @pgmap: Points to the hosting device page map. */
                         struct dev_pagemap *pgmap;
                         void *zone_device_data;
-                        unsigned long _zd_pad_1;        /* uses mapping */
+                        /*
+                         * ZONE_DEVICE private pages are counted as being
+                         * mapped so the next 3 words hold the mapping, index,
+                         * and private fields from the source anonymous or
+                         * page cache page while the page is migrated to device
+                         * private memory.
+                         * ZONE_DEVICE MEMORY_DEVICE_FS_DAX pages also
+                         * use the mapping, index, and private fields when
+                         * pmem backed DAX files are mapped.
+                         */
                 };
 
                 /** @rcu_head: You can use this to free a page by RCU. */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index d77d717c620c..3f38c30d2f13 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -215,8 +215,9 @@ enum node_stat_item {
         NR_INACTIVE_FILE,       /*  "     "     "   "       "         */
         NR_ACTIVE_FILE,         /*  "     "     "   "       "         */
         NR_UNEVICTABLE,         /*  "     "     "   "       "         */
-        NR_SLAB_RECLAIMABLE,
-        NR_SLAB_UNRECLAIMABLE,
+        NR_SLAB_RECLAIMABLE,    /* Please do not reorder this item */
+        NR_SLAB_UNRECLAIMABLE,  /* and this one without looking at
+                                 * memcg_flush_percpu_vmstats() first. */
         NR_ISOLATED_ANON,       /* Temporary isolated pages from anon lru */
         NR_ISOLATED_FILE,       /* Temporary isolated pages from file lru */
         WORKINGSET_NODES,
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
index b2c1648f7e5d..5714fd35a83c 100644
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
@@ -814,6 +814,7 @@ struct tee_client_device_id {
 /**
  * struct wmi_device_id - WMI device identifier
  * @guid_string: 36 char string of the form fa50ff2b-f2e8-45de-83fa-65417f2f49ba
+ * @context: pointer to driver specific data
  */
 struct wmi_device_id {
         const char guid_string[UUID_STRING_LEN+1];
diff --git a/include/linux/netfilter/nf_conntrack_h323_asn1.h b/include/linux/netfilter/nf_conntrack_h323_asn1.h
index 91d6275292a5..19df78341fb3 100644
--- a/include/linux/netfilter/nf_conntrack_h323_asn1.h
+++ b/include/linux/netfilter/nf_conntrack_h323_asn1.h
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /****************************************************************************
- * ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323
- *                            conntrack/NAT module.
+ * BER and PER decoding library for H.323 conntrack/NAT module.
  *
  * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@users.sourceforge.net>
  *
diff --git a/include/linux/netfilter/nf_conntrack_h323_types.h b/include/linux/netfilter/nf_conntrack_h323_types.h
index 7a6871ac8784..74c6f9241944 100644
--- a/include/linux/netfilter/nf_conntrack_h323_types.h
+++ b/include/linux/netfilter/nf_conntrack_h323_types.h
@@ -4,6 +4,9 @@
  * Copyright (c) 2006 Jing Min Zhao <zhaojingmin@users.sourceforge.net>
  */
 
+#ifndef _NF_CONNTRACK_H323_TYPES_H
+#define _NF_CONNTRACK_H323_TYPES_H
+
 typedef struct TransportAddress_ipAddress {     /* SEQUENCE */
         int options;            /* No use */
         unsigned int ip;
@@ -931,3 +934,5 @@ typedef struct RasMessage {	/* CHOICE */
                 InfoRequestResponse infoRequestResponse;
         };
 } RasMessage;
+
+#endif /* _NF_CONNTRACK_H323_TYPES_H */
diff --git a/include/linux/of.h b/include/linux/of.h
index 0cf857012f11..844f89e1b039 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -1164,7 +1164,7 @@ static inline int of_property_read_string_index(const struct device_node *np,
 }
 
 /**
- * of_property_read_bool - Findfrom a property
+ * of_property_read_bool - Find a property
  * @np:         device node from which the property value is to be read.
  * @propname:   name of the property to be searched.
  *
diff --git a/include/linux/page-flags-layout.h b/include/linux/page-flags-layout.h
index 1dda31825ec4..71283739ffd2 100644
--- a/include/linux/page-flags-layout.h
+++ b/include/linux/page-flags-layout.h
@@ -32,6 +32,7 @@
 
 #endif /* CONFIG_SPARSEMEM */
 
+#ifndef BUILD_VDSO32_64
 /*
  * page->flags layout:
  *
@@ -76,20 +77,22 @@
 #define LAST_CPUPID_SHIFT 0
 #endif
 
-#if SECTIONS_WIDTH+ZONES_WIDTH+NODES_SHIFT+LAST_CPUPID_SHIFT <= BITS_PER_LONG - NR_PAGEFLAGS
+#ifdef CONFIG_KASAN_SW_TAGS
+#define KASAN_TAG_WIDTH 8
+#else
+#define KASAN_TAG_WIDTH 0
+#endif
+
+#if SECTIONS_WIDTH+ZONES_WIDTH+NODES_SHIFT+LAST_CPUPID_SHIFT+KASAN_TAG_WIDTH \
+        <= BITS_PER_LONG - NR_PAGEFLAGS
 #define LAST_CPUPID_WIDTH LAST_CPUPID_SHIFT
 #else
 #define LAST_CPUPID_WIDTH 0
 #endif
 
-#ifdef CONFIG_KASAN_SW_TAGS
-#define KASAN_TAG_WIDTH 8
 #if SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH+LAST_CPUPID_WIDTH+KASAN_TAG_WIDTH \
         > BITS_PER_LONG - NR_PAGEFLAGS
-#error "KASAN: not enough bits in page flags for tag"
-#endif
-#else
-#define KASAN_TAG_WIDTH 0
+#error "Not enough bits in page flags"
 #endif
 
 /*
@@ -104,4 +107,5 @@
 #define LAST_CPUPID_NOT_IN_PAGE_FLAGS
 #endif
 
+#endif
 #endif /* _LINUX_PAGE_FLAGS_LAYOUT */
diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h
index b848517da64c..f91cb8898ff0 100644
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
@@ -152,6 +152,8 @@ enum pageflags {
         PG_savepinned = PG_dirty,
         /* Has a grant mapping of another (foreign) domain's page. */
         PG_foreign = PG_owner_priv_1,
+        /* Remapped by swiotlb-xen. */
+        PG_xen_remapped = PG_owner_priv_1,
 
         /* SLOB */
         PG_slob_free = PG_private,
@@ -329,6 +331,8 @@ PAGEFLAG(Pinned, pinned, PF_NO_COMPOUND)
         TESTSCFLAG(Pinned, pinned, PF_NO_COMPOUND)
 PAGEFLAG(SavePinned, savepinned, PF_NO_COMPOUND);
 PAGEFLAG(Foreign, foreign, PF_NO_COMPOUND);
+PAGEFLAG(XenRemapped, xen_remapped, PF_NO_COMPOUND)
+        TESTCLEARFLAG(XenRemapped, xen_remapped, PF_NO_COMPOUND)
 
 PAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)
         __CLEARPAGEFLAG(Reserved, reserved, PF_NO_COMPOUND)
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9e700d9f9f28..82e4cd1b7ac3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1567,8 +1567,10 @@ extern bool pcie_ports_native;
 
 #ifdef CONFIG_PCIEASPM
 bool pcie_aspm_support_enabled(void);
+bool pcie_aspm_enabled(struct pci_dev *pdev);
 #else
 static inline bool pcie_aspm_support_enabled(void) { return false; }
+static inline bool pcie_aspm_enabled(struct pci_dev *pdev) { return false; }
 #endif
 
 #ifdef CONFIG_PCIEAER
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 462b90b73f93..2fb9c8ffaf10 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1107,6 +1107,7 @@ int genphy_c45_an_disable_aneg(struct phy_device *phydev);
 int genphy_c45_read_mdix(struct phy_device *phydev);
 int genphy_c45_pma_read_abilities(struct phy_device *phydev);
 int genphy_c45_read_status(struct phy_device *phydev);
+int genphy_c45_config_aneg(struct phy_device *phydev);
 
 /* The gen10g_* functions are the old Clause 45 stub */
 int gen10g_config_aneg(struct phy_device *phydev);
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8dc1811487f5..9f51932bd543 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1092,7 +1092,15 @@ struct task_struct {
         u64                             last_sum_exec_runtime;
         struct callback_head            numa_work;
 
-        struct numa_group               *numa_group;
+        /*
+         * This pointer is only modified for current in syscall and
+         * pagefault context (and for tasks being destroyed), so it can be read
+         * from any of the following contexts:
+         *  - RCU read-side critical section
+         *  - current->numa_group from everywhere
+         *  - task's runqueue locked, task not running
+         */
+        struct numa_group __rcu         *numa_group;
 
         /*
          * numa_faults is an array split into four regions:
diff --git a/include/linux/sched/numa_balancing.h b/include/linux/sched/numa_balancing.h
index e7dd04a84ba8..3988762efe15 100644
--- a/include/linux/sched/numa_balancing.h
+++ b/include/linux/sched/numa_balancing.h
@@ -19,7 +19,7 @@
 extern void task_numa_fault(int last_node, int node, int pages, int flags);
 extern pid_t task_numa_group_id(struct task_struct *p);
 extern void set_numabalancing_state(bool enabled);
-extern void task_numa_free(struct task_struct *p);
+extern void task_numa_free(struct task_struct *p, bool final);
 extern bool should_numa_migrate_memory(struct task_struct *p, struct page *page,
                                         int src_nid, int dst_cpu);
 #else
@@ -34,7 +34,7 @@ static inline pid_t task_numa_group_id(struct task_struct *p)
 static inline void set_numabalancing_state(bool enabled)
 {
 }
-static inline void task_numa_free(struct task_struct *p)
+static inline void task_numa_free(struct task_struct *p, bool final)
 {
 }
 static inline bool should_numa_migrate_memory(struct task_struct *p,
diff --git a/include/linux/signal.h b/include/linux/signal.h
index b5d99482d3fe..1a5f88316b08 100644
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
@@ -282,6 +282,9 @@ extern void signal_setup_done(int failed, struct ksignal *ksig, int stepping);
 extern void exit_signals(struct task_struct *tsk);
 extern void kernel_sigaction(int, __sighandler_t);
 
+#define SIG_KTHREAD ((__force __sighandler_t)2)
+#define SIG_KTHREAD_KERNEL ((__force __sighandler_t)3)
+
 static inline void allow_signal(int sig)
 {
         /*
@@ -289,7 +292,17 @@ static inline void allow_signal(int sig)
          * know it'll be handled, so that they don't get converted to
          * SIGKILL or just silently dropped.
          */
-        kernel_sigaction(sig, (__force __sighandler_t)2);
+        kernel_sigaction(sig, SIG_KTHREAD);
+}
+
+static inline void allow_kernel_signal(int sig)
+{
+        /*
+         * Kernel threads handle their own signals. Let the signal code
+         * know signals sent by the kernel will be handled, so that they
+         * don't get silently dropped.
+         */
+        kernel_sigaction(sig, SIG_KTHREAD_KERNEL);
 }
 
 static inline void disallow_signal(int sig)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index d8af86d995d6..ba5583522d24 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1374,6 +1374,14 @@ static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)
         to->l4_hash = from->l4_hash;
 };
 
+static inline void skb_copy_decrypted(struct sk_buff *to,
+                                      const struct sk_buff *from)
+{
+#ifdef CONFIG_TLS_DEVICE
+        to->decrypted = from->decrypted;
+#endif
+}
+
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
 static inline unsigned char *skb_end_pointer(const struct sk_buff *skb)
 {
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h
index 50ced8aba9db..e4b3fb4bb77c 100644
--- a/include/linux/skmsg.h
+++ b/include/linux/skmsg.h
@@ -354,7 +354,13 @@ static inline void sk_psock_restore_proto(struct sock *sk,
         sk->sk_write_space = psock->saved_write_space;
 
         if (psock->sk_proto) {
-                sk->sk_prot = psock->sk_proto;
+                struct inet_connection_sock *icsk = inet_csk(sk);
+                bool has_ulp = !!icsk->icsk_ulp_data;
+
+                if (has_ulp)
+                        tcp_update_ulp(sk, psock->sk_proto);
+                else
+                        sk->sk_prot = psock->sk_proto;
                 psock->sk_proto = NULL;
         }
 }
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 97523818cb14..fc0bed59fc84 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -292,6 +292,9 @@ struct ucred {
 #define MSG_BATCH       0x40000 /* sendmmsg(): more messages coming */
 #define MSG_EOF         MSG_FIN
 #define MSG_NO_SHARED_FRAGS 0x80000 /* sendpage() internal : page frags are not shared */
+#define MSG_SENDPAGE_DECRYPTED  0x100000 /* sendpage() internal : page may carry
+                                          * plain text and require encryption
+                                          */
 
 #define MSG_ZEROCOPY    0x4000000       /* Use user data in kernel path */
 #define MSG_FASTOPEN    0x20000000      /* Send data in TCP SYN */
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index baa3ecdb882f..27536b961552 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -98,7 +98,6 @@ typedef void			(*rpc_action)(struct rpc_task *);
 
 struct rpc_call_ops {
         void (*rpc_call_prepare)(struct rpc_task *, void *);
-        void (*rpc_call_prepare_transmit)(struct rpc_task *, void *);
         void (*rpc_call_done)(struct rpc_task *, void *);
         void (*rpc_count_stats)(struct rpc_task *, void *);
         void (*rpc_release)(void *);
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h
index 7acb953298a7..84ff2844df2a 100644
--- a/include/linux/timekeeper_internal.h
+++ b/include/linux/timekeeper_internal.h
@@ -57,6 +57,7 @@ struct tk_read_base {
  * @cs_was_changed_seq: The sequence number of clocksource change events
  * @next_leap_ktime:    CLOCK_MONOTONIC time value of a pending leap-second
  * @raw_sec:            CLOCK_MONOTONIC_RAW  time in seconds
+ * @monotonic_to_boot:  CLOCK_MONOTONIC to CLOCK_BOOTTIME offset
  * @cycle_interval:     Number of clock cycles in one NTP interval
  * @xtime_interval:     Number of clock shifted nano seconds in one NTP
  *                      interval.
@@ -84,6 +85,9 @@ struct tk_read_base {
  *
  * wall_to_monotonic is no longer the boot time, getboottime must be
  * used instead.
+ *
+ * @monotonic_to_boottime is a timespec64 representation of @offs_boot to
+ * accelerate the VDSO update for CLOCK_BOOTTIME.
  */
 struct timekeeper {
         struct tk_read_base     tkr_mono;
@@ -99,6 +103,7 @@ struct timekeeper {
         u8                      cs_was_changed_seq;
         ktime_t                 next_leap_ktime;
         u64                     raw_sec;
+        struct timespec64       monotonic_to_boot;
 
         /* The following members are for timekeeping internal use */
         u64                     cycle_interval;
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 5150436783e8..30a8cdcfd4a4 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -548,6 +548,7 @@ extern int trace_event_get_offsets(struct trace_event_call *call);
 
 #define is_signed_type(type)    (((type)(-1)) < (type)1)
 
+int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set);
 int trace_set_clr_event(const char *system, const char *event, int set);
 
 /*
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 83d35d993e8c..e87826e23d59 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1457,7 +1457,7 @@ typedef void (*usb_complete_t)(struct urb *);
  * field rather than determining a dma address themselves.
  *
  * Note that transfer_buffer must still be set if the controller
- * does not support DMA (as indicated by bus.uses_dma) and when talking
+ * does not support DMA (as indicated by hcd_uses_dma()) and when talking
  * to root hub. If you have to trasfer between highmem zone and the device
  * on such controller, create a bounce buffer or bail out with an error.
  * If transfer_buffer cannot be set (is in highmem) and the controller is DMA
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index bab27ccc8ff5..a20e7815d814 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -422,6 +422,9 @@ static inline bool hcd_periodic_completion_in_progress(struct usb_hcd *hcd,
         return hcd->high_prio_bh.completing_ep == ep;
 }
 
+#define hcd_uses_dma(hcd) \
+        (IS_ENABLED(CONFIG_HAS_DMA) && (hcd)->self.uses_dma)
+
 extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);
 extern int usb_hcd_check_unlink_urb(struct usb_hcd *hcd, struct urb *urb,
                 int status);
diff --git a/include/linux/wait.h b/include/linux/wait.h
index b6f77cf60dd7..30c515520fb2 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -127,6 +127,19 @@ static inline int waitqueue_active(struct wait_queue_head *wq_head)
 }
 
 /**
+ * wq_has_single_sleeper - check if there is only one sleeper
+ * @wq_head: wait queue head
+ *
+ * Returns true of wq_head has only one sleeper on the list.
+ *
+ * Please refer to the comment for waitqueue_active.
+ */
+static inline bool wq_has_single_sleeper(struct wait_queue_head *wq_head)
+{
+        return list_is_singular(&wq_head->head);
+}
+
+/**
  * wq_has_sleeper - check if there are any waiting processes
  * @wq_head: wait queue head
  *
diff --git a/include/math-emu/op-common.h b/include/math-emu/op-common.h
index f37d12877754..adcc6a97db61 100644
--- a/include/math-emu/op-common.h
+++ b/include/math-emu/op-common.h
@@ -308,6 +308,7 @@ do {									     \
                                                                              \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):                           \
     R##_e = X##_e;                                                           \
+          /* Fall through */                                                 \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):                            \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):                               \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):                              \
@@ -318,6 +319,7 @@ do {									     \
                                                                              \
   case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):                           \
     R##_e = Y##_e;                                                           \
+          /* Fall through */                                                 \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):                            \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):                               \
   case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):                              \
@@ -415,6 +417,7 @@ do {							\
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):          \
   case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):         \
     R##_s = X##_s;                                      \
+        /* Fall through */                              \
                                                         \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):          \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
@@ -428,6 +431,7 @@ do {							\
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):          \
   case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):         \
     R##_s = Y##_s;                                      \
+        /* Fall through */                              \
                                                         \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):       \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
@@ -493,6 +497,7 @@ do {							\
                                                         \
   case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
     FP_SET_EXCEPTION(FP_EX_DIVZERO);                    \
+          /* Fall through */                            \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):         \
   case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
     R##_c = FP_CLS_INF;                                 \
diff --git a/include/misc/charlcd.h b/include/misc/charlcd.h
deleted file mode 100644
index 8cf6c18b0adb..000000000000
--- a/include/misc/charlcd.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Character LCD driver for Linux
- *
- * Copyright (C) 2000-2008, Willy Tarreau <w@1wt.eu>
- * Copyright (C) 2016-2017 Glider bvba
- */
-
-struct charlcd {
-        const struct charlcd_ops *ops;
-        const unsigned char *char_conv; /* Optional */
-
-        int ifwidth;                    /* 4-bit or 8-bit (default) */
-        int height;
-        int width;
-        int bwidth;                     /* Default set by charlcd_alloc() */
-        int hwidth;                     /* Default set by charlcd_alloc() */
-
-        void *drvdata;                  /* Set by charlcd_alloc() */
-};
-
-struct charlcd_ops {
-        /* Required */
-        void (*write_cmd)(struct charlcd *lcd, int cmd);
-        void (*write_data)(struct charlcd *lcd, int data);
-
-        /* Optional */
-        void (*write_cmd_raw4)(struct charlcd *lcd, int cmd);   /* 4-bit only */
-        void (*clear_fast)(struct charlcd *lcd);
-        void (*backlight)(struct charlcd *lcd, int on);
-};
-
-struct charlcd *charlcd_alloc(unsigned int drvdata_size);
-void charlcd_free(struct charlcd *lcd);
-
-int charlcd_register(struct charlcd *lcd);
-int charlcd_unregister(struct charlcd *lcd);
-
-void charlcd_poke(struct charlcd *lcd);
diff --git a/include/net/act_api.h b/include/net/act_api.h
index c61a1bf4e3de..3a1a72990fce 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -15,6 +15,7 @@
 struct tcf_idrinfo {
         struct mutex    lock;
         struct idr      action_idr;
+        struct net      *net;
 };
 
 struct tc_action_ops;
@@ -108,7 +109,7 @@ struct tc_action_net {
 };
 
 static inline
-int tc_action_net_init(struct tc_action_net *tn,
+int tc_action_net_init(struct net *net, struct tc_action_net *tn,
                        const struct tc_action_ops *ops)
 {
         int err = 0;
@@ -117,6 +118,7 @@ int tc_action_net_init(struct tc_action_net *tn,
         if (!tn->idrinfo)
                 return -ENOMEM;
         tn->ops = ops;
+        tn->idrinfo->net = net;
         mutex_init(&tn->idrinfo->lock);
         idr_init(&tn->idrinfo->action_idr);
         return err;
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index becdad576859..3f62b347b04a 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -206,7 +206,7 @@ static inline int ipv6_mc_may_pull(struct sk_buff *skb,
                                    unsigned int len)
 {
         if (skb_transport_offset(skb) + ipv6_transport_len(skb) < len)
-                return -EINVAL;
+                return 0;
 
         return pskb_may_pull(skb, len);
 }
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index ded574b32c20..ffc95b382eb5 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -278,6 +278,7 @@ struct hci_dev {
         __u16           conn_info_min_age;
         __u16           conn_info_max_age;
         __u16           auth_payload_timeout;
+        __u8            min_enc_key_size;
         __u8            ssp_debug_mode;
         __u8            hw_error_code;
         __u32           clock;
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 88c27153a4bc..26e2ad2c7027 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4170,7 +4170,7 @@ struct sta_opmode_info {
         u8 rx_nss;
 };
 
-#define VENDOR_CMD_RAW_DATA ((const struct nla_policy *)ERR_PTR(-ENODATA))
+#define VENDOR_CMD_RAW_DATA ((const struct nla_policy *)(long)(-ENODATA))
 
 /**
  * struct wiphy_vendor_command - vendor command definition
@@ -7320,6 +7320,21 @@ void cfg80211_pmsr_complete(struct wireless_dev *wdev,
                             struct cfg80211_pmsr_request *req,
                             gfp_t gfp);
 
+/**
+ * cfg80211_iftype_allowed - check whether the interface can be allowed
+ * @wiphy: the wiphy
+ * @iftype: interface type
+ * @is_4addr: use_4addr flag, must be '0' when check_swif is '1'
+ * @check_swif: check iftype against software interfaces
+ *
+ * Check whether the interface is allowed to operate; additionally, this API
+ * can be used to check iftype against the software interfaces when
+ * check_swif is '1'.
+ */
+bool cfg80211_iftype_allowed(struct wiphy *wiphy, enum nl80211_iftype iftype,
+                             bool is_4addr, u8 check_swif);
+
+
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
 /* wiphy_printk helpers, similar to dev_printk */
diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index db337299e81e..b16d21636d69 100644
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -2,8 +2,8 @@
 #define _NET_FLOW_OFFLOAD_H
 
 #include <linux/kernel.h>
+#include <linux/list.h>
 #include <net/flow_dissector.h>
-#include <net/sch_generic.h>
 
 struct flow_match {
         struct flow_dissector   *dissector;
@@ -249,6 +249,10 @@ enum flow_block_binder_type {
         FLOW_BLOCK_BINDER_TYPE_CLSACT_EGRESS,
 };
 
+struct flow_block {
+        struct list_head cb_list;
+};
+
 struct netlink_ext_ack;
 
 struct flow_block_offload {
@@ -256,29 +260,33 @@ struct flow_block_offload {
         enum flow_block_binder_type binder_type;
         bool block_shared;
         struct net *net;
+        struct flow_block *block;
         struct list_head cb_list;
         struct list_head *driver_block_list;
         struct netlink_ext_ack *extack;
 };
 
+enum tc_setup_type;
+typedef int flow_setup_cb_t(enum tc_setup_type type, void *type_data,
+                            void *cb_priv);
+
 struct flow_block_cb {
         struct list_head        driver_list;
         struct list_head        list;
-        struct net              *net;
-        tc_setup_cb_t           *cb;
+        flow_setup_cb_t         *cb;
         void                    *cb_ident;
         void                    *cb_priv;
         void                    (*release)(void *cb_priv);
         unsigned int            refcnt;
 };
 
-struct flow_block_cb *flow_block_cb_alloc(struct net *net, tc_setup_cb_t *cb,
+struct flow_block_cb *flow_block_cb_alloc(flow_setup_cb_t *cb,
                                           void *cb_ident, void *cb_priv,
                                           void (*release)(void *cb_priv));
 void flow_block_cb_free(struct flow_block_cb *block_cb);
 
-struct flow_block_cb *flow_block_cb_lookup(struct flow_block_offload *offload,
-                                           tc_setup_cb_t *cb, void *cb_ident);
+struct flow_block_cb *flow_block_cb_lookup(struct flow_block *block,
+                                           flow_setup_cb_t *cb, void *cb_ident);
 
 void *flow_block_cb_priv(struct flow_block_cb *block_cb);
 void flow_block_cb_incref(struct flow_block_cb *block_cb);
@@ -296,11 +304,12 @@ static inline void flow_block_cb_remove(struct flow_block_cb *block_cb,
         list_move(&block_cb->list, &offload->cb_list);
 }
 
-bool flow_block_cb_is_busy(tc_setup_cb_t *cb, void *cb_ident,
+bool flow_block_cb_is_busy(flow_setup_cb_t *cb, void *cb_ident,
                            struct list_head *driver_block_list);
 
 int flow_block_cb_setup_simple(struct flow_block_offload *f,
-                               struct list_head *driver_list, tc_setup_cb_t *cb,
+                               struct list_head *driver_list,
+                               flow_setup_cb_t *cb,
                                void *cb_ident, void *cb_priv, bool ingress_only);
 
 enum flow_cls_command {
@@ -333,4 +342,9 @@ flow_cls_offload_flow_rule(struct flow_cls_offload *flow_cmd)
         return flow_cmd->rule;
 }
 
+static inline void flow_block_init(struct flow_block *flow_block)
+{
+        INIT_LIST_HEAD(&flow_block->cb_list);
+}
+
 #endif /* _NET_FLOW_OFFLOAD_H */
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 010f26b31c89..bac79e817776 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -171,7 +171,7 @@ int inet_frag_queue_insert(struct inet_frag_queue *q, struct sk_buff *skb,
 void *inet_frag_reasm_prepare(struct inet_frag_queue *q, struct sk_buff *skb,
                               struct sk_buff *parent);
 void inet_frag_reasm_finish(struct inet_frag_queue *q, struct sk_buff *head,
-                            void *reasm_data);
+                            void *reasm_data, bool try_coalesce);
 struct sk_buff *inet_frag_pull_head(struct inet_frag_queue *q);
 
 #endif
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 4a9da951a794..ab40d7afdc54 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -52,7 +52,7 @@ struct bpf_prog;
 #define NETDEV_HASHENTRIES (1 << NETDEV_HASHBITS)
 
 struct net {
-        refcount_t              passive;        /* To decided when the network
+        refcount_t              passive;        /* To decide when the network
                                                  * namespace should be freed.
                                                  */
         refcount_t              count;          /* To decided when the network
@@ -61,7 +61,6 @@ struct net {
         spinlock_t              rules_mod_lock;
 
         u32                     hash_mix;
-        atomic64_t              cookie_gen;
 
         struct list_head        list;           /* list of network namespaces */
         struct list_head        exit_list;      /* To linked to call pernet exit
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index 93ce6b0daaba..573429be4d59 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -76,6 +76,11 @@ struct nf_conntrack_expect_policy {
 #define NF_CT_EXPECT_CLASS_DEFAULT      0
 #define NF_CT_EXPECT_MAX_CNT            255
 
+/* Allow to reuse expectations with the same tuples from different master
+ * conntracks.
+ */
+#define NF_CT_EXP_F_SKIP_MASTER 0x1
+
 int nf_conntrack_expect_pernet_init(struct net *net);
 void nf_conntrack_expect_pernet_fini(struct net *net);
 
@@ -122,10 +127,11 @@ void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t,
                        u_int8_t, const __be16 *, const __be16 *);
 void nf_ct_expect_put(struct nf_conntrack_expect *exp);
 int nf_ct_expect_related_report(struct nf_conntrack_expect *expect, 
-                                u32 portid, int report);
-static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect)
+                                u32 portid, int report, unsigned int flags);
+static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect,
+                                       unsigned int flags)
 {
-        return nf_ct_expect_related_report(expect, 0, 0);
+        return nf_ct_expect_related_report(expect, 0, 0, flags);
 }
 
 #endif /*_NF_CONNTRACK_EXPECT_H*/
diff --git a/include/net/netfilter/nf_conntrack_synproxy.h b/include/net/netfilter/nf_conntrack_synproxy.h
index 8f00125b06f4..44513b93bd55 100644
--- a/include/net/netfilter/nf_conntrack_synproxy.h
+++ b/include/net/netfilter/nf_conntrack_synproxy.h
@@ -68,6 +68,7 @@ struct synproxy_options {
         u8                              options;
         u8                              wscale;
         u16                             mss;
+        u16                             mss_encode;
         u32                             tsval;
         u32                             tsecr;
 };
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h
index 35dfdd9f69b3..475d6f28ca67 100644
--- a/include/net/netfilter/nf_tables.h
+++ b/include/net/netfilter/nf_tables.h
@@ -11,6 +11,7 @@
 #include <linux/rhashtable.h>
 #include <net/netfilter/nf_flow_table.h>
 #include <net/netlink.h>
+#include <net/flow_offload.h>
 
 struct module;
 
@@ -420,8 +421,7 @@ struct nft_set {
         unsigned char                   *udata;
         /* runtime data below here */
         const struct nft_set_ops        *ops ____cacheline_aligned;
-        u16                             flags:13,
-                                        bound:1,
+        u16                             flags:14,
                                         genmask:2;
         u8                              klen;
         u8                              dlen;
@@ -951,7 +951,7 @@ struct nft_stats {
  *      @stats: per-cpu chain stats
  *      @chain: the chain
  *      @dev_name: device name that this base chain is attached to (if any)
- *      @cb_list: list of flow block callbacks (for hardware offload)
+ *      @flow_block: flow block (for hardware offload)
  */
 struct nft_base_chain {
         struct nf_hook_ops              ops;
@@ -961,7 +961,7 @@ struct nft_base_chain {
         struct nft_stats __percpu       *stats;
         struct nft_chain                chain;
         char                            dev_name[IFNAMSIZ];
-        struct list_head                cb_list;
+        struct flow_block               flow_block;
 };
 
 static inline struct nft_base_chain *nft_base_chain(const struct nft_chain *chain)
@@ -1347,12 +1347,15 @@ struct nft_trans_rule {
 struct nft_trans_set {
         struct nft_set                  *set;
         u32                             set_id;
+        bool                            bound;
 };
 
 #define nft_trans_set(trans)    \
         (((struct nft_trans_set *)trans->data)->set)
 #define nft_trans_set_id(trans) \
         (((struct nft_trans_set *)trans->data)->set_id)
+#define nft_trans_set_bound(trans)      \
+        (((struct nft_trans_set *)trans->data)->bound)
 
 struct nft_trans_chain {
         bool                            update;
@@ -1383,12 +1386,15 @@ struct nft_trans_table {
 struct nft_trans_elem {
         struct nft_set                  *set;
         struct nft_set_elem             elem;
+        bool                            bound;
 };
 
 #define nft_trans_elem_set(trans)       \
         (((struct nft_trans_elem *)trans->data)->set)
 #define nft_trans_elem(trans)   \
         (((struct nft_trans_elem *)trans->data)->elem)
+#define nft_trans_elem_set_bound(trans) \
+        (((struct nft_trans_elem *)trans->data)->bound)
 
 struct nft_trans_obj {
         struct nft_object               *obj;
diff --git a/include/net/netfilter/nf_tables_offload.h b/include/net/netfilter/nf_tables_offload.h
index 3196663a10e3..c8b9dec376f5 100644
--- a/include/net/netfilter/nf_tables_offload.h
+++ b/include/net/netfilter/nf_tables_offload.h
@@ -73,4 +73,6 @@ int nft_flow_rule_offload_commit(struct net *net);
         (__reg)->key            = __key;                                \
         memset(&(__reg)->mask, 0xff, (__reg)->len);
 
+int nft_chain_offload_priority(struct nft_base_chain *basechain);
+
 #endif
diff --git a/include/net/netlink.h b/include/net/netlink.h
index e4650e5b64a1..b140c8f1be22 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -684,9 +684,8 @@ static inline int nlmsg_parse(const struct nlmsghdr *nlh, int hdrlen,
                               const struct nla_policy *policy,
                               struct netlink_ext_ack *extack)
 {
-        return __nla_parse(tb, maxtype, nlmsg_attrdata(nlh, hdrlen),
-                           nlmsg_attrlen(nlh, hdrlen), policy,
-                           NL_VALIDATE_STRICT, extack);
+        return __nlmsg_parse(nlh, hdrlen, tb, maxtype, policy,
+                             NL_VALIDATE_STRICT, extack);
 }
 
 /**
diff --git a/include/net/nexthop.h b/include/net/nexthop.h
index 25f1f9a8419b..95f766c31c90 100644
--- a/include/net/nexthop.h
+++ b/include/net/nexthop.h
@@ -141,12 +141,6 @@ static inline unsigned int nexthop_num_path(const struct nexthop *nh)
 
                 nh_grp = rcu_dereference_rtnl(nh->nh_grp);
                 rc = nh_grp->num_nh;
-        } else {
-                const struct nh_info *nhi;
-
-                nhi = rcu_dereference_rtnl(nh->nh_info);
-                if (nhi->reject_nh)
-                        rc = 0;
         }
 
         return rc;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index 841faadceb6e..98be18ef1ed3 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -6,7 +6,6 @@
 #include <linux/workqueue.h>
 #include <net/sch_generic.h>
 #include <net/act_api.h>
-#include <net/flow_offload.h>
 #include <net/net_namespace.h>
 
 /* TC action not accessible from user space */
@@ -126,14 +125,14 @@ static inline struct Qdisc *tcf_block_q(struct tcf_block *block)
 }
 
 static inline
-int tc_setup_cb_block_register(struct tcf_block *block, tc_setup_cb_t *cb,
+int tc_setup_cb_block_register(struct tcf_block *block, flow_setup_cb_t *cb,
                                void *cb_priv)
 {
         return 0;
 }
 
 static inline
-void tc_setup_cb_block_unregister(struct tcf_block *block, tc_setup_cb_t *cb,
+void tc_setup_cb_block_unregister(struct tcf_block *block, flow_setup_cb_t *cb,
                                   void *cb_priv)
 {
 }
@@ -647,7 +646,7 @@ tc_cls_common_offload_init(struct flow_cls_common_offload *cls_common,
 {
         cls_common->chain_index = tp->chain->index;
         cls_common->protocol = tp->protocol;
-        cls_common->prio = tp->prio;
+        cls_common->prio = tp->prio >> 16;
         if (tc_skip_sw(flags) || flags & TCA_CLS_FLAGS_VERBOSE)
                 cls_common->extack = extack;
 }
diff --git a/include/net/psample.h b/include/net/psample.h
index 37a4df2325b2..6b578ce69cd8 100644
--- a/include/net/psample.h
+++ b/include/net/psample.h
@@ -11,6 +11,7 @@ struct psample_group {
         u32 group_num;
         u32 refcount;
         u32 seq;
+        struct rcu_head rcu;
 };
 
 struct psample_group *psample_group_get(struct net *net, u32 group_num);
diff --git a/include/net/route.h b/include/net/route.h
index 630a0493f1f3..dfce19c9fa96 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -233,7 +233,7 @@ void rt_del_uncached_list(struct rtable *rt);
 
 int fib_dump_info_fnhe(struct sk_buff *skb, struct netlink_callback *cb,
                        u32 table_id, struct fib_info *fi,
-                       int *fa_index, int fa_start);
+                       int *fa_index, int fa_start, unsigned int flags);
 
 static inline void ip_rt_put(struct rtable *rt)
 {
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 855167bbc372..6b6b01234dd9 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -15,6 +15,7 @@
 #include <linux/mutex.h>
 #include <net/gen_stats.h>
 #include <net/rtnetlink.h>
+#include <net/flow_offload.h>
 
 struct Qdisc_ops;
 struct qdisc_walker;
@@ -22,9 +23,6 @@ struct tcf_walker;
 struct module;
 struct bpf_flow_keys;
 
-typedef int tc_setup_cb_t(enum tc_setup_type type,
-                          void *type_data, void *cb_priv);
-
 typedef int tc_indr_block_bind_cb_t(struct net_device *dev, void *cb_priv,
                                     enum tc_setup_type type, void *type_data);
 
@@ -313,7 +311,7 @@ struct tcf_proto_ops {
         void                    (*walk)(struct tcf_proto *tp,
                                         struct tcf_walker *arg, bool rtnl_held);
         int                     (*reoffload)(struct tcf_proto *tp, bool add,
-                                             tc_setup_cb_t *cb, void *cb_priv,
+                                             flow_setup_cb_t *cb, void *cb_priv,
                                              struct netlink_ext_ack *extack);
         void                    (*bind_class)(void *, u32, unsigned long);
         void *                  (*tmplt_create)(struct net *net,
@@ -401,7 +399,7 @@ struct tcf_block {
         refcount_t refcnt;
         struct net *net;
         struct Qdisc *q;
-        struct list_head cb_list;
+        struct flow_block flow_block;
         struct list_head owner_list;
         bool keep_dst;
         unsigned int offloadcnt; /* Number of oddloaded filters */
diff --git a/include/net/sock.h b/include/net/sock.h
index 228db3998e46..2c53f1a1d905 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2482,6 +2482,7 @@ static inline bool sk_fullsock(const struct sock *sk)
 
 /* Checks if this SKB belongs to an HW offloaded socket
  * and whether any SW fallbacks are required based on dev.
+ * Check decrypted mark in case skb_orphan() cleared socket.
  */
 static inline struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,
                                                    struct net_device *dev)
@@ -2489,8 +2490,15 @@ static inline struct sk_buff *sk_validate_xmit_skb(struct sk_buff *skb,
 #ifdef CONFIG_SOCK_VALIDATE_XMIT
         struct sock *sk = skb->sk;
 
-        if (sk && sk_fullsock(sk) && sk->sk_validate_xmit_skb)
+        if (sk && sk_fullsock(sk) && sk->sk_validate_xmit_skb) {
                 skb = sk->sk_validate_xmit_skb(sk, dev, skb);
+#ifdef CONFIG_TLS_DEVICE
+        } else if (unlikely(skb->decrypted)) {
+                pr_warn_ratelimited("unencrypted skb with no associated socket - dropping\n");
+                kfree_skb(skb);
+                skb = NULL;
+#endif
+        }
 #endif
 
         return skb;
diff --git a/include/net/tc_act/tc_police.h b/include/net/tc_act/tc_police.h
index 8b9ef3664262..cfdc7cb82cad 100644
--- a/include/net/tc_act/tc_police.h
+++ b/include/net/tc_act/tc_police.h
@@ -54,7 +54,7 @@ static inline u64 tcf_police_rate_bytes_ps(const struct tc_action *act)
         struct tcf_police *police = to_police(act);
         struct tcf_police_params *params;
 
-        params = rcu_dereference_bh(police->params);
+        params = rcu_dereference_bh_rtnl(police->params);
         return params->rate.rate_bytes_ps;
 }
 
@@ -63,7 +63,7 @@ static inline s64 tcf_police_tcfp_burst(const struct tc_action *act)
         struct tcf_police *police = to_police(act);
         struct tcf_police_params *params;
 
-        params = rcu_dereference_bh(police->params);
+        params = rcu_dereference_bh_rtnl(police->params);
         return params->tcfp_burst;
 }
 
diff --git a/include/net/tc_act/tc_sample.h b/include/net/tc_act/tc_sample.h
index 0a559d4b6f0f..b4fce0fae645 100644
--- a/include/net/tc_act/tc_sample.h
+++ b/include/net/tc_act/tc_sample.h
@@ -44,7 +44,7 @@ static inline int tcf_sample_trunc_size(const struct tc_action *a)
 static inline struct psample_group *
 tcf_sample_psample_group(const struct tc_action *a)
 {
-        return rcu_dereference(to_sample(a)->psample_group);
+        return rcu_dereference_rtnl(to_sample(a)->psample_group);
 }
 
 #endif /* __NET_TC_SAMPLE_H */
diff --git a/include/net/tcp.h b/include/net/tcp.h
index f42d300f0cfa..81e8ade1e6e4 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1709,6 +1709,11 @@ static inline struct sk_buff *tcp_rtx_queue_head(const struct sock *sk)
         return skb_rb_first(&sk->tcp_rtx_queue);
 }
 
+static inline struct sk_buff *tcp_rtx_queue_tail(const struct sock *sk)
+{
+        return skb_rb_last(&sk->tcp_rtx_queue);
+}
+
 static inline struct sk_buff *tcp_write_queue_head(const struct sock *sk)
 {
         return skb_peek(&sk->sk_write_queue);
@@ -2103,6 +2108,8 @@ struct tcp_ulp_ops {
 
         /* initialize ulp */
         int (*init)(struct sock *sk);
+        /* update ulp */
+        void (*update)(struct sock *sk, struct proto *p);
         /* cleanup ulp */
         void (*release)(struct sock *sk);
 
@@ -2114,6 +2121,7 @@ void tcp_unregister_ulp(struct tcp_ulp_ops *type);
 int tcp_set_ulp(struct sock *sk, const char *name);
 void tcp_get_available_ulp(char *buf, size_t len);
 void tcp_cleanup_ulp(struct sock *sk);
+void tcp_update_ulp(struct sock *sk, struct proto *p);
 
 #define MODULE_ALIAS_TCP_ULP(name)                              \
         __MODULE_INFO(alias, alias_userspace, name);            \
diff --git a/include/net/tls.h b/include/net/tls.h
index 584609174fe0..41b2d41bb1b8 100644
--- a/include/net/tls.h
+++ b/include/net/tls.h
@@ -107,9 +107,7 @@ struct tls_device {
 enum {
         TLS_BASE,
         TLS_SW,
-#ifdef CONFIG_TLS_DEVICE
         TLS_HW,
-#endif
         TLS_HW_RECORD,
         TLS_NUM_CONFIG,
 };
@@ -162,6 +160,7 @@ struct tls_sw_context_tx {
         int async_capable;
 
 #define BIT_TX_SCHEDULED        0
+#define BIT_TX_CLOSING          1
         unsigned long tx_bitmask;
 };
 
@@ -272,6 +271,8 @@ struct tls_context {
         unsigned long flags;
 
         /* cache cold stuff */
+        struct proto *sk_proto;
+
         void (*sk_destruct)(struct sock *sk);
         void (*sk_proto_close)(struct sock *sk, long timeout);
 
@@ -355,13 +356,17 @@ int tls_sk_attach(struct sock *sk, int optname, char __user *optval,
                   unsigned int optlen);
 
 int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx, int tx);
+void tls_sw_strparser_arm(struct sock *sk, struct tls_context *ctx);
+void tls_sw_strparser_done(struct tls_context *tls_ctx);
 int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size);
 int tls_sw_sendpage(struct sock *sk, struct page *page,
                     int offset, size_t size, int flags);
-void tls_sw_close(struct sock *sk, long timeout);
-void tls_sw_free_resources_tx(struct sock *sk);
+void tls_sw_cancel_work_tx(struct tls_context *tls_ctx);
+void tls_sw_release_resources_tx(struct sock *sk);
+void tls_sw_free_ctx_tx(struct tls_context *tls_ctx);
 void tls_sw_free_resources_rx(struct sock *sk);
 void tls_sw_release_resources_rx(struct sock *sk);
+void tls_sw_free_ctx_rx(struct tls_context *tls_ctx);
 int tls_sw_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
                    int nonblock, int flags, int *addr_len);
 bool tls_sw_stream_read(const struct sock *sk);
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index c5f8a9f17063..4f225175cb91 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2647,7 +2647,9 @@ struct ib_client {
                         const union ib_gid *gid,
                         const struct sockaddr *addr,
                         void *client_data);
-        struct list_head list;
+
+        refcount_t uses;
+        struct completion uses_zero;
         u32 client_id;
 
         /* kverbs are not required by the client */
diff --git a/include/rdma/rdmavt_qp.h b/include/rdma/rdmavt_qp.h
index 0eeea520a853..e06c77d76463 100644
--- a/include/rdma/rdmavt_qp.h
+++ b/include/rdma/rdmavt_qp.h
@@ -608,7 +608,7 @@ static inline void rvt_qp_wqe_reserve(
 /**
  * rvt_qp_wqe_unreserve - clean reserved operation
  * @qp - the rvt qp
- * @wqe - the send wqe
+ * @flags - send wqe flags
  *
  * This decrements the reserve use count.
  *
@@ -620,11 +620,9 @@ static inline void rvt_qp_wqe_reserve(
  * the compiler does not juggle the order of the s_last
  * ring index and the decrementing of s_reserved_used.
  */
-static inline void rvt_qp_wqe_unreserve(
-        struct rvt_qp *qp,
-        struct rvt_swqe *wqe)
+static inline void rvt_qp_wqe_unreserve(struct rvt_qp *qp, int flags)
 {
-        if (unlikely(wqe->wr.send_flags & RVT_SEND_RESERVE_USED)) {
+        if (unlikely(flags & RVT_SEND_RESERVE_USED)) {
                 atomic_dec(&qp->s_reserved_used);
                 /* insure no compiler re-order up to s_last change */
                 smp_mb__after_atomic();
@@ -853,6 +851,7 @@ rvt_qp_complete_swqe(struct rvt_qp *qp,
         u32 byte_len, last;
         int flags = wqe->wr.send_flags;
 
+        rvt_qp_wqe_unreserve(qp, flags);
         rvt_put_qp_swqe(qp, wqe);
 
         need_completion =
diff --git a/include/rdma/restrack.h b/include/rdma/restrack.h
index b0fc6b26bdf5..83df1ec6664e 100644
--- a/include/rdma/restrack.h
+++ b/include/rdma/restrack.h
@@ -105,8 +105,7 @@ struct rdma_restrack_entry {
 };
 
 int rdma_restrack_count(struct ib_device *dev,
-                        enum rdma_restrack_type type,
-                        struct pid_namespace *ns);
+                        enum rdma_restrack_type type);
 
 void rdma_restrack_kadd(struct rdma_restrack_entry *res);
 void rdma_restrack_uadd(struct rdma_restrack_entry *res);
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 2d64b53f947c..9b87e1a1c646 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -115,7 +115,7 @@ struct fc_disc_port {
         struct fc_lport    *lp;
         struct list_head   peers;
         struct work_struct rport_work;
-        u32                port_id;
+        u32                port_id;
 };
 
 /**
@@ -155,14 +155,14 @@ struct fc_rport_operations {
  */
 struct fc_rport_libfc_priv {
         struct fc_lport            *local_port;
-        enum fc_rport_state        rp_state;
+        enum fc_rport_state        rp_state;
         u16                        flags;
         #define FC_RP_FLAGS_REC_SUPPORTED       (1 << 0)
         #define FC_RP_FLAGS_RETRY               (1 << 1)
         #define FC_RP_STARTED                   (1 << 2)
         #define FC_RP_FLAGS_CONF_REQ            (1 << 3)
-        unsigned int               e_d_tov;
-        unsigned int               r_a_tov;
+        unsigned int               e_d_tov;
+        unsigned int               r_a_tov;
 };
 
 /**
@@ -191,24 +191,24 @@ struct fc_rport_priv {
         struct fc_lport             *local_port;
         struct fc_rport             *rport;
         struct kref                 kref;
-        enum fc_rport_state         rp_state;
+        enum fc_rport_state         rp_state;
         struct fc_rport_identifiers ids;
         u16                         flags;
-        u16                         max_seq;
+        u16                         max_seq;
         u16                         disc_id;
         u16                         maxframe_size;
-        unsigned int                retries;
-        unsigned int                major_retries;
-        unsigned int                e_d_tov;
-        unsigned int                r_a_tov;
-        struct mutex                rp_mutex;
+        unsigned int                retries;
+        unsigned int                major_retries;
+        unsigned int                e_d_tov;
+        unsigned int                r_a_tov;
+        struct mutex                rp_mutex;
         struct delayed_work         retry_work;
-        enum fc_rport_event         event;
+        enum fc_rport_event         event;
         struct fc_rport_operations  *ops;
-        struct list_head            peers;
-        struct work_struct          event_work;
+        struct list_head            peers;
+        struct work_struct          event_work;
         u32                         supported_classes;
-        u16                         prli_count;
+        u16                         prli_count;
         struct rcu_head             rcu;
         u16                         sp_features;
         u8                          spp_type;
@@ -618,12 +618,12 @@ struct libfc_function_template {
  * @disc_callback: Callback routine called when discovery completes
  */
 struct fc_disc {
-        unsigned char         retry_count;
-        unsigned char         pending;
-        unsigned char         requested;
-        unsigned short        seq_count;
-        unsigned char         buf_len;
-        u16                   disc_id;
+        unsigned char         retry_count;
+        unsigned char         pending;
+        unsigned char         requested;
+        unsigned short        seq_count;
+        unsigned char         buf_len;
+        u16                   disc_id;
 
         struct list_head      rports;
         void                  *priv;
@@ -697,7 +697,7 @@ struct fc_lport {
         struct fc_rport_priv           *ms_rdata;
         struct fc_rport_priv           *ptp_rdata;
         void                           *scsi_priv;
-        struct fc_disc                 disc;
+        struct fc_disc                 disc;
 
         /* Virtual port information */
         struct list_head               vports;
@@ -715,7 +715,7 @@ struct fc_lport {
         u8                             retry_count;
 
         /* Fabric information */
-        u32                            port_id;
+        u32                            port_id;
         u64                            wwpn;
         u64                            wwnn;
         unsigned int                   service_params;
@@ -743,11 +743,11 @@ struct fc_lport {
         struct fc_ns_fts               fcts;
 
         /* Miscellaneous */
-        struct mutex                   lp_mutex;
-        struct list_head               list;
+        struct mutex                   lp_mutex;
+        struct list_head               list;
         struct delayed_work            retry_work;
         void                           *prov[FC_FC4_PROV_SIZE];
-        struct list_head               lport_list;
+        struct list_head               lport_list;
 };
 
 /**
diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index c50fb297e265..2568cb0627ec 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -31,7 +31,7 @@
  * FIP tunable parameters.
  */
 #define FCOE_CTLR_START_DELAY   2000    /* mS after first adv. to choose FCF */
-#define FCOE_CTRL_SOL_TOV       2000    /* min. solicitation interval (mS) */
+#define FCOE_CTLR_SOL_TOV       2000    /* min. solicitation interval (mS) */
 #define FCOE_CTLR_FCF_LIMIT     20      /* max. number of FCF entries */
 #define FCOE_CTLR_VN2VN_LOGIN_LIMIT 3   /* max. VN2VN rport login retries */
 
@@ -229,6 +229,7 @@ struct fcoe_fcf {
  * @vn_mac:     VN_Node assigned MAC address for data
  */
 struct fcoe_rport {
+        struct fc_rport_priv rdata;
         unsigned long time;
         u16 fcoe_len;
         u16 flags;
diff --git a/include/soc/arc/mcip.h b/include/soc/arc/mcip.h
index 50f49e043668..d1a93c73f006 100644
--- a/include/soc/arc/mcip.h
+++ b/include/soc/arc/mcip.h
@@ -46,7 +46,9 @@ struct mcip_cmd {
 #define CMD_IDU_ENABLE                  0x71
 #define CMD_IDU_DISABLE                 0x72
 #define CMD_IDU_SET_MODE                0x74
+#define CMD_IDU_READ_MODE               0x75
 #define CMD_IDU_SET_DEST                0x76
+#define CMD_IDU_ACK_CIRQ                0x79
 #define CMD_IDU_SET_MASK                0x7C
 
 #define IDU_M_TRIG_LEVEL                0x0
@@ -119,4 +121,13 @@ static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param,
         __mcip_cmd(cmd, param);
 }
 
+/*
+ * Read MCIP register
+ */
+static inline unsigned int __mcip_cmd_read(unsigned int cmd, unsigned int param)
+{
+        __mcip_cmd(cmd, param);
+        return read_aux_reg(ARC_REG_MCIP_READBACK);
+}
+
 #endif
diff --git a/include/soc/fsl/qe/qe.h b/include/soc/fsl/qe/qe.h
index 3f9d6b6a5691..c1036d16ed03 100644
--- a/include/soc/fsl/qe/qe.h
+++ b/include/soc/fsl/qe/qe.h
@@ -259,7 +259,7 @@ static inline int qe_alive_during_sleep(void)
 
 /* Structure that defines QE firmware binary files.
  *
- * See Documentation/powerpc/qe_firmware.txt for a description of these
+ * See Documentation/powerpc/qe_firmware.rst for a description of these
  * fields.
  */
 struct qe_firmware {
diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
index 7fea496f1f34..83b17682e01c 100644
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
@@ -47,6 +47,9 @@ struct hdmi_codec_params {
         int channels;
 };
 
+typedef void (*hdmi_codec_plugged_cb)(struct device *dev,
+                                      bool plugged);
+
 struct hdmi_codec_pdata;
 struct hdmi_codec_ops {
         /*
@@ -88,6 +91,14 @@ struct hdmi_codec_ops {
          */
         int (*get_dai_id)(struct snd_soc_component *comment,
                           struct device_node *endpoint);
+
+        /*
+         * Hook callback function to handle connector plug event.
+         * Optional
+         */
+        int (*hook_plugged_cb)(struct device *dev, void *data,
+                               hdmi_codec_plugged_cb fn,
+                               struct device *codec_dev);
 };
 
 /* HDMI codec initalization data */
@@ -99,6 +110,12 @@ struct hdmi_codec_pdata {
         void *data;
 };
 
+struct snd_soc_component;
+struct snd_soc_jack;
+
+int hdmi_codec_set_jack_detect(struct snd_soc_component *component,
+                               struct snd_soc_jack *jack);
+
 #define HDMI_CODEC_DRV_NAME "hdmi-audio-codec"
 
 #endif /* __HDMI_CODEC_H__ */
diff --git a/include/sound/pcm.h b/include/sound/pcm.h
index 1e9bb1c91770..bbe6eb1ff5d2 100644
--- a/include/sound/pcm.h
+++ b/include/sound/pcm.h
@@ -117,6 +117,8 @@ struct snd_pcm_ops {
 #define SNDRV_PCM_RATE_96000            (1<<10)         /* 96000Hz */
 #define SNDRV_PCM_RATE_176400           (1<<11)         /* 176400Hz */
 #define SNDRV_PCM_RATE_192000           (1<<12)         /* 192000Hz */
+#define SNDRV_PCM_RATE_352800           (1<<13)         /* 352800Hz */
+#define SNDRV_PCM_RATE_384000           (1<<14)         /* 384000Hz */
 
 #define SNDRV_PCM_RATE_CONTINUOUS       (1<<30)         /* continuous range */
 #define SNDRV_PCM_RATE_KNOT             (1<<31)         /* supports more non-continuos rates */
@@ -129,6 +131,9 @@ struct snd_pcm_ops {
                                          SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000)
 #define SNDRV_PCM_RATE_8000_192000      (SNDRV_PCM_RATE_8000_96000|SNDRV_PCM_RATE_176400|\
                                          SNDRV_PCM_RATE_192000)
+#define SNDRV_PCM_RATE_8000_384000      (SNDRV_PCM_RATE_8000_192000|\
+                                         SNDRV_PCM_RATE_352800|\
+                                         SNDRV_PCM_RATE_384000)
 #define _SNDRV_PCM_FMTBIT(fmt)          (1ULL << (__force int)SNDRV_PCM_FORMAT_##fmt)
 #define SNDRV_PCM_FMTBIT_S8             _SNDRV_PCM_FMTBIT(S8)
 #define SNDRV_PCM_FMTBIT_U8             _SNDRV_PCM_FMTBIT(U8)
diff --git a/include/sound/soc-acpi-intel-match.h b/include/sound/soc-acpi-intel-match.h
index bb5e1e4ce8bf..6c9929abd90b 100644
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
@@ -25,6 +25,8 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[];
 extern struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[];
+extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[];
 
 /*
  * generic table used for HDA codec-based platforms, possibly with
diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
new file mode 100644
index 000000000000..5d80b2eef525
--- /dev/null
+++ b/include/sound/soc-component.h
@@ -0,0 +1,387 @@
+/* SPDX-License-Identifier: GPL-2.0
+ *
+ * soc-component.h
+ *
+ * Copyright (c) 2019 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __SOC_COMPONENT_H
+#define __SOC_COMPONENT_H
+
+#include <sound/soc.h>
+
+/*
+ * Component probe and remove ordering levels for components with runtime
+ * dependencies.
+ */
+#define SND_SOC_COMP_ORDER_FIRST        -2
+#define SND_SOC_COMP_ORDER_EARLY        -1
+#define SND_SOC_COMP_ORDER_NORMAL        0
+#define SND_SOC_COMP_ORDER_LATE          1
+#define SND_SOC_COMP_ORDER_LAST          2
+
+#define for_each_comp_order(order)              \
+        for (order  = SND_SOC_COMP_ORDER_FIRST; \
+             order <= SND_SOC_COMP_ORDER_LAST;  \
+             order++)
+
+/* component interface */
+struct snd_soc_component_driver {
+        const char *name;
+
+        /* Default control and setup, added after probe() is run */
+        const struct snd_kcontrol_new *controls;
+        unsigned int num_controls;
+        const struct snd_soc_dapm_widget *dapm_widgets;
+        unsigned int num_dapm_widgets;
+        const struct snd_soc_dapm_route *dapm_routes;
+        unsigned int num_dapm_routes;
+
+        int (*probe)(struct snd_soc_component *component);
+        void (*remove)(struct snd_soc_component *component);
+        int (*suspend)(struct snd_soc_component *component);
+        int (*resume)(struct snd_soc_component *component);
+
+        unsigned int (*read)(struct snd_soc_component *component,
+                             unsigned int reg);
+        int (*write)(struct snd_soc_component *component,
+                     unsigned int reg, unsigned int val);
+
+        /* pcm creation and destruction */
+        int (*pcm_new)(struct snd_soc_pcm_runtime *rtd);
+        void (*pcm_free)(struct snd_pcm *pcm);
+
+        /* component wide operations */
+        int (*set_sysclk)(struct snd_soc_component *component,
+                          int clk_id, int source, unsigned int freq, int dir);
+        int (*set_pll)(struct snd_soc_component *component, int pll_id,
+                       int source, unsigned int freq_in, unsigned int freq_out);
+        int (*set_jack)(struct snd_soc_component *component,
+                        struct snd_soc_jack *jack,  void *data);
+
+        /* DT */
+        int (*of_xlate_dai_name)(struct snd_soc_component *component,
+                                 struct of_phandle_args *args,
+                                 const char **dai_name);
+        int (*of_xlate_dai_id)(struct snd_soc_component *comment,
+                               struct device_node *endpoint);
+        void (*seq_notifier)(struct snd_soc_component *component,
+                             enum snd_soc_dapm_type type, int subseq);
+        int (*stream_event)(struct snd_soc_component *component, int event);
+        int (*set_bias_level)(struct snd_soc_component *component,
+                              enum snd_soc_bias_level level);
+
+        const struct snd_pcm_ops *ops;
+        const struct snd_compr_ops *compr_ops;
+
+        /* probe ordering - for components with runtime dependencies */
+        int probe_order;
+        int remove_order;
+
+        /*
+         * signal if the module handling the component should not be removed
+         * if a pcm is open. Setting this would prevent the module
+         * refcount being incremented in probe() but allow it be incremented
+         * when a pcm is opened and decremented when it is closed.
+         */
+        unsigned int module_get_upon_open:1;
+
+        /* bits */
+        unsigned int idle_bias_on:1;
+        unsigned int suspend_bias_off:1;
+        unsigned int use_pmdown_time:1; /* care pmdown_time at stop */
+        unsigned int endianness:1;
+        unsigned int non_legacy_dai_naming:1;
+
+        /* this component uses topology and ignore machine driver FEs */
+        const char *ignore_machine;
+        const char *topology_name_prefix;
+        int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
+                                  struct snd_pcm_hw_params *params);
+        bool use_dai_pcm_id;    /* use DAI link PCM ID as PCM device number */
+        int be_pcm_base;        /* base device ID for all BE PCMs */
+};
+
+struct snd_soc_component {
+        const char *name;
+        int id;
+        const char *name_prefix;
+        struct device *dev;
+        struct snd_soc_card *card;
+
+        unsigned int active;
+
+        unsigned int suspended:1; /* is in suspend PM state */
+
+        struct list_head list;
+        struct list_head card_aux_list; /* for auxiliary bound components */
+        struct list_head card_list;
+
+        const struct snd_soc_component_driver *driver;
+
+        struct list_head dai_list;
+        int num_dai;
+
+        struct regmap *regmap;
+        int val_bytes;
+
+        struct mutex io_mutex;
+
+        /* attached dynamic objects */
+        struct list_head dobj_list;
+
+        /*
+         * DO NOT use any of the fields below in drivers, they are temporary and
+         * are going to be removed again soon. If you use them in driver code
+         * the driver will be marked as BROKEN when these fields are removed.
+         */
+
+        /* Don't use these, use snd_soc_component_get_dapm() */
+        struct snd_soc_dapm_context dapm;
+
+        /* machine specific init */
+        int (*init)(struct snd_soc_component *component);
+
+#ifdef CONFIG_DEBUG_FS
+        struct dentry *debugfs_root;
+        const char *debugfs_prefix;
+#endif
+};
+
+#define for_each_component_dais(component, dai)\
+        list_for_each_entry(dai, &(component)->dai_list, list)
+#define for_each_component_dais_safe(component, dai, _dai)\
+        list_for_each_entry_safe(dai, _dai, &(component)->dai_list, list)
+
+/**
+ * snd_soc_dapm_to_component() - Casts a DAPM context to the component it is
+ *  embedded in
+ * @dapm: The DAPM context to cast to the component
+ *
+ * This function must only be used on DAPM contexts that are known to be part of
+ * a component (e.g. in a component driver). Otherwise the behavior is
+ * undefined.
+ */
+static inline struct snd_soc_component *snd_soc_dapm_to_component(
+        struct snd_soc_dapm_context *dapm)
+{
+        return container_of(dapm, struct snd_soc_component, dapm);
+}
+
+/**
+ * snd_soc_component_get_dapm() - Returns the DAPM context associated with a
+ *  component
+ * @component: The component for which to get the DAPM context
+ */
+static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
+        struct snd_soc_component *component)
+{
+        return &component->dapm;
+}
+
+/**
+ * snd_soc_component_init_bias_level() - Initialize COMPONENT DAPM bias level
+ * @component: The COMPONENT for which to initialize the DAPM bias level
+ * @level: The DAPM level to initialize to
+ *
+ * Initializes the COMPONENT DAPM bias level. See snd_soc_dapm_init_bias_level()
+ */
+static inline void
+snd_soc_component_init_bias_level(struct snd_soc_component *component,
+                                  enum snd_soc_bias_level level)
+{
+        snd_soc_dapm_init_bias_level(
+                snd_soc_component_get_dapm(component), level);
+}
+
+/**
+ * snd_soc_component_get_bias_level() - Get current COMPONENT DAPM bias level
+ * @component: The COMPONENT for which to get the DAPM bias level
+ *
+ * Returns: The current DAPM bias level of the COMPONENT.
+ */
+static inline enum snd_soc_bias_level
+snd_soc_component_get_bias_level(struct snd_soc_component *component)
+{
+        return snd_soc_dapm_get_bias_level(
+                snd_soc_component_get_dapm(component));
+}
+
+/**
+ * snd_soc_component_force_bias_level() - Set the COMPONENT DAPM bias level
+ * @component: The COMPONENT for which to set the level
+ * @level: The level to set to
+ *
+ * Forces the COMPONENT bias level to a specific state. See
+ * snd_soc_dapm_force_bias_level().
+ */
+static inline int
+snd_soc_component_force_bias_level(struct snd_soc_component *component,
+                                   enum snd_soc_bias_level level)
+{
+        return snd_soc_dapm_force_bias_level(
+                snd_soc_component_get_dapm(component),
+                level);
+}
+
+/**
+ * snd_soc_dapm_kcontrol_component() - Returns the component associated to a
+ * kcontrol
+ * @kcontrol: The kcontrol
+ *
+ * This function must only be used on DAPM contexts that are known to be part of
+ * a COMPONENT (e.g. in a COMPONENT driver). Otherwise the behavior is undefined
+ */
+static inline struct snd_soc_component *snd_soc_dapm_kcontrol_component(
+        struct snd_kcontrol *kcontrol)
+{
+        return snd_soc_dapm_to_component(snd_soc_dapm_kcontrol_dapm(kcontrol));
+}
+
+/**
+ * snd_soc_component_cache_sync() - Sync the register cache with the hardware
+ * @component: COMPONENT to sync
+ *
+ * Note: This function will call regcache_sync()
+ */
+static inline int snd_soc_component_cache_sync(
+        struct snd_soc_component *component)
+{
+        return regcache_sync(component->regmap);
+}
+
+/* component IO */
+int snd_soc_component_read(struct snd_soc_component *component,
+                           unsigned int reg, unsigned int *val);
+unsigned int snd_soc_component_read32(struct snd_soc_component *component,
+                                      unsigned int reg);
+int snd_soc_component_write(struct snd_soc_component *component,
+                            unsigned int reg, unsigned int val);
+int snd_soc_component_update_bits(struct snd_soc_component *component,
+                                  unsigned int reg, unsigned int mask,
+                                  unsigned int val);
+int snd_soc_component_update_bits_async(struct snd_soc_component *component,
+                                        unsigned int reg, unsigned int mask,
+                                        unsigned int val);
+void snd_soc_component_async_complete(struct snd_soc_component *component);
+int snd_soc_component_test_bits(struct snd_soc_component *component,
+                                unsigned int reg, unsigned int mask,
+                                unsigned int value);
+
+/* component wide operations */
+int snd_soc_component_set_sysclk(struct snd_soc_component *component,
+                                 int clk_id, int source,
+                                 unsigned int freq, int dir);
+int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id,
+                              int source, unsigned int freq_in,
+                              unsigned int freq_out);
+int snd_soc_component_set_jack(struct snd_soc_component *component,
+                               struct snd_soc_jack *jack, void *data);
+
+void snd_soc_component_seq_notifier(struct snd_soc_component *component,
+                                    enum snd_soc_dapm_type type, int subseq);
+int snd_soc_component_stream_event(struct snd_soc_component *component,
+                                   int event);
+int snd_soc_component_set_bias_level(struct snd_soc_component *component,
+                                     enum snd_soc_bias_level level);
+
+#ifdef CONFIG_REGMAP
+void snd_soc_component_init_regmap(struct snd_soc_component *component,
+                                   struct regmap *regmap);
+void snd_soc_component_exit_regmap(struct snd_soc_component *component);
+#endif
+
+#define snd_soc_component_module_get_when_probe(component)\
+        snd_soc_component_module_get(component, 0)
+#define snd_soc_component_module_get_when_open(component)       \
+        snd_soc_component_module_get(component, 1)
+int snd_soc_component_module_get(struct snd_soc_component *component,
+                                 int upon_open);
+#define snd_soc_component_module_put_when_remove(component)     \
+        snd_soc_component_module_put(component, 0)
+#define snd_soc_component_module_put_when_close(component)      \
+        snd_soc_component_module_put(component, 1)
+void snd_soc_component_module_put(struct snd_soc_component *component,
+                                  int upon_open);
+
+static inline void snd_soc_component_set_drvdata(struct snd_soc_component *c,
+                                                 void *data)
+{
+        dev_set_drvdata(c->dev, data);
+}
+
+static inline void *snd_soc_component_get_drvdata(struct snd_soc_component *c)
+{
+        return dev_get_drvdata(c->dev);
+}
+
+static inline bool snd_soc_component_is_active(
+        struct snd_soc_component *component)
+{
+        return component->active != 0;
+}
+
+/* component pin */
+int snd_soc_component_enable_pin(struct snd_soc_component *component,
+                                 const char *pin);
+int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
+                                          const char *pin);
+int snd_soc_component_disable_pin(struct snd_soc_component *component,
+                                  const char *pin);
+int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
+                                           const char *pin);
+int snd_soc_component_nc_pin(struct snd_soc_component *component,
+                             const char *pin);
+int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
+                                      const char *pin);
+int snd_soc_component_get_pin_status(struct snd_soc_component *component,
+                                     const char *pin);
+int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
+                                       const char *pin);
+int snd_soc_component_force_enable_pin_unlocked(
+        struct snd_soc_component *component,
+        const char *pin);
+
+/* component driver ops */
+int snd_soc_component_open(struct snd_soc_component *component,
+                           struct snd_pcm_substream *substream);
+int snd_soc_component_close(struct snd_soc_component *component,
+                            struct snd_pcm_substream *substream);
+int snd_soc_component_prepare(struct snd_soc_component *component,
+                              struct snd_pcm_substream *substream);
+int snd_soc_component_hw_params(struct snd_soc_component *component,
+                                struct snd_pcm_substream *substream,
+                                struct snd_pcm_hw_params *params);
+int snd_soc_component_hw_free(struct snd_soc_component *component,
+                              struct snd_pcm_substream *substream);
+int snd_soc_component_trigger(struct snd_soc_component *component,
+                              struct snd_pcm_substream *substream,
+                              int cmd);
+void snd_soc_component_suspend(struct snd_soc_component *component);
+void snd_soc_component_resume(struct snd_soc_component *component);
+int snd_soc_component_is_suspended(struct snd_soc_component *component);
+int snd_soc_component_probe(struct snd_soc_component *component);
+void snd_soc_component_remove(struct snd_soc_component *component);
+int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
+                                      struct device_node *ep);
+int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
+                                        struct of_phandle_args *args,
+                                        const char **dai_name);
+
+int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);
+int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,
+                                unsigned int cmd, void *arg);
+int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
+                                    int channel, unsigned long pos,
+                                    void __user *buf, unsigned long bytes);
+struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
+                                        unsigned long offset);
+int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
+                               struct vm_area_struct *vma);
+int snd_soc_pcm_component_new(struct snd_pcm *pcm);
+void snd_soc_pcm_component_free(struct snd_pcm *pcm);
+
+#endif /* __SOC_COMPONENT_H */
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index f5d70041108f..939c73db6a03 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -145,6 +145,31 @@ int snd_soc_dai_get_channel_map(struct snd_soc_dai *dai,
 
 int snd_soc_dai_is_dummy(struct snd_soc_dai *dai);
 
+int snd_soc_dai_hw_params(struct snd_soc_dai *dai,
+                          struct snd_pcm_substream *substream,
+                          struct snd_pcm_hw_params *params);
+void snd_soc_dai_hw_free(struct snd_soc_dai *dai,
+                         struct snd_pcm_substream *substream);
+int snd_soc_dai_startup(struct snd_soc_dai *dai,
+                        struct snd_pcm_substream *substream);
+void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
+                          struct snd_pcm_substream *substream);
+int snd_soc_dai_prepare(struct snd_soc_dai *dai,
+                        struct snd_pcm_substream *substream);
+int snd_soc_dai_trigger(struct snd_soc_dai *dai,
+                        struct snd_pcm_substream *substream, int cmd);
+int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,
+                        struct snd_pcm_substream *substream, int cmd);
+snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
+                                    struct snd_pcm_substream *substream);
+void snd_soc_dai_suspend(struct snd_soc_dai *dai);
+void snd_soc_dai_resume(struct snd_soc_dai *dai);
+int snd_soc_dai_probe(struct snd_soc_dai *dai);
+int snd_soc_dai_remove(struct snd_soc_dai *dai);
+int snd_soc_dai_compress_new(struct snd_soc_dai *dai,
+                             struct snd_soc_pcm_runtime *rtd, int num);
+bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);
+
 struct snd_soc_dai_ops {
         /*
          * DAI clocking configuration, all optional.
@@ -268,8 +293,6 @@ struct snd_soc_dai_driver {
         /* Optional Callback used at pcm creation*/
         int (*pcm_new)(struct snd_soc_pcm_runtime *rtd,
                        struct snd_soc_dai *dai);
-        /* DAI is also used for the control bus */
-        bool bus_control;
 
         /* ops */
         const struct snd_soc_dai_ops *ops;
@@ -281,6 +304,7 @@ struct snd_soc_dai_driver {
         unsigned int symmetric_rates:1;
         unsigned int symmetric_channels:1;
         unsigned int symmetric_samplebits:1;
+        unsigned int bus_control:1; /* DAI is also used for the control bus */
 
         /* probe ordering - for components with runtime dependencies */
         int probe_order;
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index c00a0b8ade08..6e8a31225383 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -353,6 +353,8 @@ struct device;
 #define SND_SOC_DAPM_WILL_PMD   0x80    /* called at start of sequence */
 #define SND_SOC_DAPM_PRE_POST_PMD \
                                 (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)
+#define SND_SOC_DAPM_PRE_POST_PMU \
+                                (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU)
 
 /* convenience event type detection */
 #define SND_SOC_DAPM_EVENT_ON(e)        \
@@ -402,6 +404,9 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,
 struct snd_soc_dapm_widget *snd_soc_dapm_new_control(
                 struct snd_soc_dapm_context *dapm,
                 const struct snd_soc_dapm_widget *widget);
+struct snd_soc_dapm_widget *snd_soc_dapm_new_control_unlocked(
+                struct snd_soc_dapm_context *dapm,
+                const struct snd_soc_dapm_widget *widget);
 int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
                                  struct snd_soc_dai *dai);
 int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
@@ -414,6 +419,9 @@ int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream,
 /* dapm path setup */
 int snd_soc_dapm_new_widgets(struct snd_soc_card *card);
 void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);
+void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm,
+                       struct snd_soc_card *card,
+                       struct snd_soc_component *component);
 int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,
                             const struct snd_soc_dapm_route *route, int num);
 int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm,
@@ -659,8 +667,6 @@ struct snd_soc_dapm_context {
         unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
         /* Go to BIAS_OFF in suspend if the DAPM context is idle */
         unsigned int suspend_bias_off:1;
-        void (*seq_notifier)(struct snd_soc_dapm_context *,
-                             enum snd_soc_dapm_type, int);
 
         struct device *dev; /* from parent - for debug */
         struct snd_soc_component *component; /* parent component */
@@ -670,10 +676,6 @@ struct snd_soc_dapm_context {
         enum snd_soc_bias_level target_bias_level;
         struct list_head list;
 
-        int (*stream_event)(struct snd_soc_dapm_context *dapm, int event);
-        int (*set_bias_level)(struct snd_soc_dapm_context *dapm,
-                              enum snd_soc_bias_level level);
-
         struct snd_soc_dapm_wcache path_sink_cache;
         struct snd_soc_dapm_wcache path_source_cache;
 
diff --git a/include/sound/soc-dpcm.h b/include/sound/soc-dpcm.h
index 4be3a2b7c106..e55aeb00ce2d 100644
--- a/include/sound/soc-dpcm.h
+++ b/include/sound/soc-dpcm.h
@@ -142,9 +142,16 @@ void snd_soc_dpcm_be_set_state(struct snd_soc_pcm_runtime *be, int stream,
 
 /* internal use only */
 int soc_dpcm_be_digital_mute(struct snd_soc_pcm_runtime *fe, int mute);
-void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
 int soc_dpcm_runtime_update(struct snd_soc_card *);
 
+#ifdef CONFIG_DEBUG_FS
+void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd);
+#else
+static inline void soc_dpcm_debugfs_add(struct snd_soc_pcm_runtime *rtd)
+{
+}
+#endif
+
 int dpcm_path_get(struct snd_soc_pcm_runtime *fe,
         int stream, struct snd_soc_dapm_widget_list **list_);
 int dpcm_process_paths(struct snd_soc_pcm_runtime *fe,
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 4e8071269639..f264c6509f00 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -363,21 +363,6 @@
         const struct soc_enum name = SOC_ENUM_SINGLE_VIRT(ARRAY_SIZE(xtexts), xtexts)
 
 /*
- * Component probe and remove ordering levels for components with runtime
- * dependencies.
- */
-#define SND_SOC_COMP_ORDER_FIRST                -2
-#define SND_SOC_COMP_ORDER_EARLY                -1
-#define SND_SOC_COMP_ORDER_NORMAL               0
-#define SND_SOC_COMP_ORDER_LATE         1
-#define SND_SOC_COMP_ORDER_LAST         2
-
-#define for_each_comp_order(order)              \
-        for (order  = SND_SOC_COMP_ORDER_FIRST; \
-             order <= SND_SOC_COMP_ORDER_LAST;  \
-             order++)
-
-/*
  * Bias levels
  *
  * @ON:      Bias is fully on for audio playback and capture operations.
@@ -505,10 +490,6 @@ int snd_soc_params_to_bclk(struct snd_pcm_hw_params *parms);
 int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,
         const struct snd_pcm_hardware *hw);
 
-int soc_dai_hw_params(struct snd_pcm_substream *substream,
-                      struct snd_pcm_hw_params *params,
-                      struct snd_soc_dai *dai);
-
 /* Jack reporting */
 int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type,
         struct snd_soc_jack *jack, struct snd_soc_jack_pin *pins,
@@ -751,132 +732,6 @@ struct snd_soc_compr_ops {
         int (*trigger)(struct snd_compr_stream *);
 };
 
-/* component interface */
-struct snd_soc_component_driver {
-        const char *name;
-
-        /* Default control and setup, added after probe() is run */
-        const struct snd_kcontrol_new *controls;
-        unsigned int num_controls;
-        const struct snd_soc_dapm_widget *dapm_widgets;
-        unsigned int num_dapm_widgets;
-        const struct snd_soc_dapm_route *dapm_routes;
-        unsigned int num_dapm_routes;
-
-        int (*probe)(struct snd_soc_component *);
-        void (*remove)(struct snd_soc_component *);
-        int (*suspend)(struct snd_soc_component *);
-        int (*resume)(struct snd_soc_component *);
-
-        unsigned int (*read)(struct snd_soc_component *, unsigned int);
-        int (*write)(struct snd_soc_component *, unsigned int, unsigned int);
-
-        /* pcm creation and destruction */
-        int (*pcm_new)(struct snd_soc_pcm_runtime *);
-        void (*pcm_free)(struct snd_pcm *);
-
-        /* component wide operations */
-        int (*set_sysclk)(struct snd_soc_component *component,
-                          int clk_id, int source, unsigned int freq, int dir);
-        int (*set_pll)(struct snd_soc_component *component, int pll_id,
-                       int source, unsigned int freq_in, unsigned int freq_out);
-        int (*set_jack)(struct snd_soc_component *component,
-                        struct snd_soc_jack *jack,  void *data);
-
-        /* DT */
-        int (*of_xlate_dai_name)(struct snd_soc_component *component,
-                                 struct of_phandle_args *args,
-                                 const char **dai_name);
-        int (*of_xlate_dai_id)(struct snd_soc_component *comment,
-                               struct device_node *endpoint);
-        void (*seq_notifier)(struct snd_soc_component *, enum snd_soc_dapm_type,
-                int subseq);
-        int (*stream_event)(struct snd_soc_component *, int event);
-        int (*set_bias_level)(struct snd_soc_component *component,
-                              enum snd_soc_bias_level level);
-
-        const struct snd_pcm_ops *ops;
-        const struct snd_compr_ops *compr_ops;
-
-        /* probe ordering - for components with runtime dependencies */
-        int probe_order;
-        int remove_order;
-
-        /*
-         * signal if the module handling the component should not be removed
-         * if a pcm is open. Setting this would prevent the module
-         * refcount being incremented in probe() but allow it be incremented
-         * when a pcm is opened and decremented when it is closed.
-         */
-        unsigned int module_get_upon_open:1;
-
-        /* bits */
-        unsigned int idle_bias_on:1;
-        unsigned int suspend_bias_off:1;
-        unsigned int use_pmdown_time:1; /* care pmdown_time at stop */
-        unsigned int endianness:1;
-        unsigned int non_legacy_dai_naming:1;
-
-        /* this component uses topology and ignore machine driver FEs */
-        const char *ignore_machine;
-        const char *topology_name_prefix;
-        int (*be_hw_params_fixup)(struct snd_soc_pcm_runtime *rtd,
-                                  struct snd_pcm_hw_params *params);
-        bool use_dai_pcm_id;    /* use the DAI link PCM ID as PCM device number */
-        int be_pcm_base;        /* base device ID for all BE PCMs */
-};
-
-struct snd_soc_component {
-        const char *name;
-        int id;
-        const char *name_prefix;
-        struct device *dev;
-        struct snd_soc_card *card;
-
-        unsigned int active;
-
-        unsigned int suspended:1; /* is in suspend PM state */
-
-        struct list_head list;
-        struct list_head card_aux_list; /* for auxiliary bound components */
-        struct list_head card_list;
-
-        const struct snd_soc_component_driver *driver;
-
-        struct list_head dai_list;
-        int num_dai;
-
-        struct regmap *regmap;
-        int val_bytes;
-
-        struct mutex io_mutex;
-
-        /* attached dynamic objects */
-        struct list_head dobj_list;
-
-        /*
-        * DO NOT use any of the fields below in drivers, they are temporary and
-        * are going to be removed again soon. If you use them in driver code the
-        * driver will be marked as BROKEN when these fields are removed.
-        */
-
-        /* Don't use these, use snd_soc_component_get_dapm() */
-        struct snd_soc_dapm_context dapm;
-
-        /* machine specific init */
-        int (*init)(struct snd_soc_component *component);
-
-#ifdef CONFIG_DEBUG_FS
-        struct dentry *debugfs_root;
-        const char *debugfs_prefix;
-#endif
-};
-
-#define for_each_component_dais(component, dai)\
-        list_for_each_entry(dai, &(component)->dai_list, list)
-#define for_each_component_dais_safe(component, dai, _dai)\
-        list_for_each_entry_safe(dai, _dai, &(component)->dai_list, list)
-
 struct snd_soc_rtdcom_list {
         struct snd_soc_component *component;
         struct list_head list; /* rtd::component_list */
@@ -1086,6 +941,7 @@ struct snd_soc_dai_link {
 #define COMP_CPU(_dai)                  { .dai_name = _dai, }
 #define COMP_CODEC(_name, _dai)         { .name = _name, .dai_name = _dai, }
 #define COMP_PLATFORM(_name)            { .name = _name }
+#define COMP_AUX(_name)                 { .name = _name }
 #define COMP_DUMMY()                    { .name = "snd-soc-dummy", .dai_name = "snd-soc-dummy-dai", }
 
 extern struct snd_soc_dai_link_component null_dailink_component[0];
@@ -1107,14 +963,11 @@ struct snd_soc_codec_conf {
 };
 
 struct snd_soc_aux_dev {
-        const char *name;               /* Codec name */
-
         /*
          * specify multi-codec either by device name, or by
          * DT/OF node, but not both.
          */
-        const char *codec_name;
-        struct device_node *codec_of_node;
+        struct snd_soc_dai_link_component dlc;
 
         /* codec/machine specific init - e.g. add machine controls */
         int (*init)(struct snd_soc_component *component);
@@ -1135,6 +988,10 @@ struct snd_soc_card {
         struct mutex mutex;
         struct mutex dapm_mutex;
 
+        /* Mutex for PCM operations */
+        struct mutex pcm_mutex;
+        enum snd_soc_pcm_subclass pcm_subclass;
+
         spinlock_t dpcm_lock;
 
         bool instantiated;
@@ -1203,8 +1060,6 @@ struct snd_soc_card {
         int num_of_dapm_routes;
         bool fully_routed;
 
-        struct work_struct deferred_resume_work;
-
         /* lists of probed devices belonging to this card */
         struct list_head component_dev_list;
         struct list_head list;
@@ -1224,7 +1079,9 @@ struct snd_soc_card {
 
 #ifdef CONFIG_DEBUG_FS
         struct dentry *debugfs_card_root;
-        struct dentry *debugfs_pop_time;
+#endif
+#ifdef CONFIG_PM_SLEEP
+        struct work_struct deferred_resume_work;
 #endif
         u32 pop_time;
 
@@ -1234,6 +1091,10 @@ struct snd_soc_card {
         for ((i) = 0;                                                   \
              ((i) < (card)->num_links) && ((link) = &(card)->dai_link[i]); \
              (i)++)
+#define for_each_card_pre_auxs(card, i, aux)                            \
+        for ((i) = 0;                                                   \
+             ((i) < (card)->num_aux_devs) && ((aux) = &(card)->aux_dev[i]); \
+             (i)++)
 
 #define for_each_card_links(card, link)                         \
         list_for_each_entry(link, &(card)->dai_link_list, list)
@@ -1245,6 +1106,12 @@ struct snd_soc_card {
 #define for_each_card_rtds_safe(card, rtd, _rtd)        \
         list_for_each_entry_safe(rtd, _rtd, &(card)->rtd_list, list)
 
+#define for_each_card_auxs(card, component)                     \
+        list_for_each_entry(component, &card->aux_comp_list, card_aux_list)
+#define for_each_card_auxs_safe(card, component, _comp) \
+        list_for_each_entry_safe(component, _comp,      \
+                                 &card->aux_comp_list, card_aux_list)
+
 #define for_each_card_components(card, component)                       \
         list_for_each_entry(component, &(card)->component_dev_list, card_list)
 
@@ -1253,8 +1120,6 @@ struct snd_soc_pcm_runtime {
         struct device *dev;
         struct snd_soc_card *card;
         struct snd_soc_dai_link *dai_link;
-        struct mutex pcm_mutex;
-        enum snd_soc_pcm_subclass pcm_subclass;
         struct snd_pcm_ops ops;
 
         unsigned int params_select; /* currently selected param for dai link */
@@ -1342,134 +1207,6 @@ struct soc_enum {
         struct snd_soc_dobj dobj;
 };
 
-/**
- * snd_soc_dapm_to_component() - Casts a DAPM context to the component it is
- *  embedded in
- * @dapm: The DAPM context to cast to the component
- *
- * This function must only be used on DAPM contexts that are known to be part of
- * a component (e.g. in a component driver). Otherwise the behavior is
- * undefined.
- */
-static inline struct snd_soc_component *snd_soc_dapm_to_component(
-        struct snd_soc_dapm_context *dapm)
-{
-        return container_of(dapm, struct snd_soc_component, dapm);
-}
-
-/**
- * snd_soc_component_get_dapm() - Returns the DAPM context associated with a
- *  component
- * @component: The component for which to get the DAPM context
- */
-static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm(
-        struct snd_soc_component *component)
-{
-        return &component->dapm;
-}
-
-/**
- * snd_soc_component_init_bias_level() - Initialize COMPONENT DAPM bias level
- * @component: The COMPONENT for which to initialize the DAPM bias level
- * @level: The DAPM level to initialize to
- *
- * Initializes the COMPONENT DAPM bias level. See snd_soc_dapm_init_bias_level().
- */
-static inline void
-snd_soc_component_init_bias_level(struct snd_soc_component *component,
-                                  enum snd_soc_bias_level level)
-{
-        snd_soc_dapm_init_bias_level(
-                snd_soc_component_get_dapm(component), level);
-}
-
-/**
- * snd_soc_component_get_bias_level() - Get current COMPONENT DAPM bias level
- * @component: The COMPONENT for which to get the DAPM bias level
- *
- * Returns: The current DAPM bias level of the COMPONENT.
- */
-static inline enum snd_soc_bias_level
-snd_soc_component_get_bias_level(struct snd_soc_component *component)
-{
-        return snd_soc_dapm_get_bias_level(
-                snd_soc_component_get_dapm(component));
-}
-
-/**
- * snd_soc_component_force_bias_level() - Set the COMPONENT DAPM bias level
- * @component: The COMPONENT for which to set the level
- * @level: The level to set to
- *
- * Forces the COMPONENT bias level to a specific state. See
- * snd_soc_dapm_force_bias_level().
- */
-static inline int
-snd_soc_component_force_bias_level(struct snd_soc_component *component,
-                                   enum snd_soc_bias_level level)
-{
-        return snd_soc_dapm_force_bias_level(
-                snd_soc_component_get_dapm(component),
-                level);
-}
-
-/**
- * snd_soc_dapm_kcontrol_component() - Returns the component associated to a kcontrol
- * @kcontrol: The kcontrol
- *
- * This function must only be used on DAPM contexts that are known to be part of
- * a COMPONENT (e.g. in a COMPONENT driver). Otherwise the behavior is undefined.
- */
-static inline struct snd_soc_component *snd_soc_dapm_kcontrol_component(
-        struct snd_kcontrol *kcontrol)
-{
-        return snd_soc_dapm_to_component(snd_soc_dapm_kcontrol_dapm(kcontrol));
-}
-
-/**
- * snd_soc_component_cache_sync() - Sync the register cache with the hardware
- * @component: COMPONENT to sync
- *
- * Note: This function will call regcache_sync()
- */
-static inline int snd_soc_component_cache_sync(
-        struct snd_soc_component *component)
-{
-        return regcache_sync(component->regmap);
-}
-
-/* component IO */
-int snd_soc_component_read(struct snd_soc_component *component,
-        unsigned int reg, unsigned int *val);
-unsigned int snd_soc_component_read32(struct snd_soc_component *component,
-                                      unsigned int reg);
-int snd_soc_component_write(struct snd_soc_component *component,
-        unsigned int reg, unsigned int val);
-int snd_soc_component_update_bits(struct snd_soc_component *component,
-        unsigned int reg, unsigned int mask, unsigned int val);
-int snd_soc_component_update_bits_async(struct snd_soc_component *component,
-        unsigned int reg, unsigned int mask, unsigned int val);
-void snd_soc_component_async_complete(struct snd_soc_component *component);
-int snd_soc_component_test_bits(struct snd_soc_component *component,
-        unsigned int reg, unsigned int mask, unsigned int value);
-
-/* component wide operations */
-int snd_soc_component_set_sysclk(struct snd_soc_component *component,
-                        int clk_id, int source, unsigned int freq, int dir);
-int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id,
-                              int source, unsigned int freq_in,
-                              unsigned int freq_out);
-int snd_soc_component_set_jack(struct snd_soc_component *component,
-                               struct snd_soc_jack *jack, void *data);
-
-#ifdef CONFIG_REGMAP
-
-void snd_soc_component_init_regmap(struct snd_soc_component *component,
-        struct regmap *regmap);
-void snd_soc_component_exit_regmap(struct snd_soc_component *component);
-
-#endif
-
 /* device driver data */
 
 static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
@@ -1483,27 +1220,6 @@ static inline void *snd_soc_card_get_drvdata(struct snd_soc_card *card)
         return card->drvdata;
 }
 
-static inline void snd_soc_component_set_drvdata(struct snd_soc_component *c,
-                void *data)
-{
-        dev_set_drvdata(c->dev, data);
-}
-
-static inline void *snd_soc_component_get_drvdata(struct snd_soc_component *c)
-{
-        return dev_get_drvdata(c->dev);
-}
-
-static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
-{
-        INIT_LIST_HEAD(&card->widgets);
-        INIT_LIST_HEAD(&card->paths);
-        INIT_LIST_HEAD(&card->dapm_list);
-        INIT_LIST_HEAD(&card->aux_comp_list);
-        INIT_LIST_HEAD(&card->component_dev_list);
-        INIT_LIST_HEAD(&card->list);
-}
-
 static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
 {
         if (mc->reg == mc->rreg && mc->shift == mc->rshift)
@@ -1540,12 +1256,6 @@ static inline unsigned int snd_soc_enum_item_to_val(struct soc_enum *e,
         return e->values[item];
 }
 
-static inline bool snd_soc_component_is_active(
-        struct snd_soc_component *component)
-{
-        return component->active != 0;
-}
-
 /**
  * snd_soc_kcontrol_component() - Returns the component that registered the
  *  control
@@ -1681,24 +1391,6 @@ static inline void snd_soc_dapm_mutex_unlock(struct snd_soc_dapm_context *dapm)
         mutex_unlock(&dapm->card->dapm_mutex);
 }
 
-int snd_soc_component_enable_pin(struct snd_soc_component *component,
-                                 const char *pin);
-int snd_soc_component_enable_pin_unlocked(struct snd_soc_component *component,
-                                          const char *pin);
-int snd_soc_component_disable_pin(struct snd_soc_component *component,
-                                  const char *pin);
-int snd_soc_component_disable_pin_unlocked(struct snd_soc_component *component,
-                                           const char *pin);
-int snd_soc_component_nc_pin(struct snd_soc_component *component,
-                             const char *pin);
-int snd_soc_component_nc_pin_unlocked(struct snd_soc_component *component,
-                                      const char *pin);
-int snd_soc_component_get_pin_status(struct snd_soc_component *component,
-                                     const char *pin);
-int snd_soc_component_force_enable_pin(struct snd_soc_component *component,
-                                       const char *pin);
-int snd_soc_component_force_enable_pin_unlocked(
-                                        struct snd_soc_component *component,
-                                        const char *pin);
+#include <sound/soc-component.h>
 
 #endif
diff --git a/include/sound/sof/control.h b/include/sound/sof/control.h
index bded69e696d4..6080ea0facd7 100644
--- a/include/sound/sof/control.h
+++ b/include/sound/sof/control.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/dai-intel.h b/include/sound/sof/dai-intel.h
index 4bb8ee138ba7..5f1ef5565be6 100644
--- a/include/sound/sof/dai-intel.h
+++ b/include/sound/sof/dai-intel.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -76,6 +76,9 @@ struct sof_ipc_dai_ssp_params {
         uint16_t tdm_per_slot_padding_flag;
         uint32_t clks_control;
         uint32_t quirks;
+        uint32_t bclk_delay;    /* guaranteed time (ms) for which BCLK
+                                 * will be driven, before sending data
+                                 */
 } __packed;
 
 /* HDA Configuration Request - SOF_IPC_DAI_HDA_CONFIG */
@@ -176,4 +179,13 @@ struct sof_ipc_dai_dmic_params {
         struct sof_ipc_dai_dmic_pdm_ctrl pdm[0];
 } __packed;
 
+/* ALH Configuration Request - SOF_IPC_DAI_ALH_CONFIG */
+struct sof_ipc_dai_alh_params {
+        struct sof_ipc_hdr hdr;
+        uint32_t stream_id;
+
+        /* reserved for future use */
+        uint32_t reserved[15];
+} __packed;
+
 #endif
diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h
index 3d174e20aa53..0f1235022146 100644
--- a/include/sound/sof/dai.h
+++ b/include/sound/sof/dai.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
@@ -49,7 +49,9 @@ enum sof_ipc_dai_type {
         SOF_DAI_INTEL_SSP,              /**< Intel SSP */
         SOF_DAI_INTEL_DMIC,             /**< Intel DMIC */
         SOF_DAI_INTEL_HDA,              /**< Intel HD/A */
-        SOF_DAI_INTEL_SOUNDWIRE,        /**< Intel SoundWire */
+        SOF_DAI_INTEL_ALH,              /**< Intel ALH  */
+        SOF_DAI_IMX_SAI,                /**< i.MX SAI */
+        SOF_DAI_IMX_ESAI,               /**< i.MX ESAI */
 };
 
 /* general purpose DAI configuration */
@@ -70,6 +72,7 @@ struct sof_ipc_dai_config {
                 struct sof_ipc_dai_ssp_params ssp;
                 struct sof_ipc_dai_dmic_params dmic;
                 struct sof_ipc_dai_hda_params hda;
+                struct sof_ipc_dai_alh_params alh;
         };
 } __packed;
 
diff --git a/include/sound/sof/header.h b/include/sound/sof/header.h
index 12867bbd4372..10f00c08dbb7 100644
--- a/include/sound/sof/header.h
+++ b/include/sound/sof/header.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/info.h b/include/sound/sof/info.h
index 16528d2b4a50..a9156b4a062c 100644
--- a/include/sound/sof/info.h
+++ b/include/sound/sof/info.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/pm.h b/include/sound/sof/pm.h
index 8ae3ad45bdf7..003879401d63 100644
--- a/include/sound/sof/pm.h
+++ b/include/sound/sof/pm.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/stream.h b/include/sound/sof/stream.h
index 643f175cb479..0b71b381b952 100644
--- a/include/sound/sof/stream.h
+++ b/include/sound/sof/stream.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/topology.h b/include/sound/sof/topology.h
index 41dcabf89899..c47b36240920 100644
--- a/include/sound/sof/topology.h
+++ b/include/sound/sof/topology.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/trace.h b/include/sound/sof/trace.h
index 9257d5473d97..fda6e8f6ead4 100644
--- a/include/sound/sof/trace.h
+++ b/include/sound/sof/trace.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/sound/sof/xtensa.h b/include/sound/sof/xtensa.h
index d25c764b10e8..dd53d36b34e1 100644
--- a/include/sound/sof/xtensa.h
+++ b/include/sound/sof/xtensa.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
 /*
  * This file is provided under a dual BSD/GPLv2 license.  When using or
  * redistributing this file, you may do so under either license.
diff --git a/include/trace/events/dma_fence.h b/include/trace/events/dma_fence.h
index 2212adda8f77..64e92d56c6a8 100644
--- a/include/trace/events/dma_fence.h
+++ b/include/trace/events/dma_fence.h
@@ -2,7 +2,7 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM dma_fence
 
-#if !defined(_TRACE_FENCE_H) || defined(TRACE_HEADER_MULTI_READ)
+#if !defined(_TRACE_DMA_FENCE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_DMA_FENCE_H
 
 #include <linux/tracepoint.h>
diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h
index f3a12566bed0..6678cf8b235b 100644
--- a/include/trace/events/napi.h
+++ b/include/trace/events/napi.h
@@ -3,7 +3,7 @@
 #define TRACE_SYSTEM napi
 
 #if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_NAPI_H_
+#define _TRACE_NAPI_H
 
 #include <linux/netdevice.h>
 #include <linux/tracepoint.h>
@@ -38,7 +38,7 @@ TRACE_EVENT(napi_poll,
 
 #undef NO_DEV
 
-#endif /* _TRACE_NAPI_H_ */
+#endif /* _TRACE_NAPI_H */
 
 /* This part must be outside protection */
 #include <trace/define_trace.h>
diff --git a/include/trace/events/qdisc.h b/include/trace/events/qdisc.h
index 60d0d8bd336d..0d1a9ebf55ba 100644
--- a/include/trace/events/qdisc.h
+++ b/include/trace/events/qdisc.h
@@ -2,7 +2,7 @@
 #define TRACE_SYSTEM qdisc
 
 #if !defined(_TRACE_QDISC_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_QDISC_H_
+#define _TRACE_QDISC_H
 
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
@@ -44,7 +44,7 @@ TRACE_EVENT(qdisc_dequeue,
                   __entry->txq_state, __entry->packets, __entry->skbaddr )
 );
 
-#endif /* _TRACE_QDISC_H_ */
+#endif /* _TRACE_QDISC_H */
 
 /* This part must be outside protection */
 #include <trace/define_trace.h>
diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index cc1d060cbf13..a13a62db3565 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -23,20 +23,17 @@
 #define __RXRPC_DECLARE_TRACE_ENUMS_ONCE_ONLY
 
 enum rxrpc_skb_trace {
-        rxrpc_skb_rx_cleaned,
-        rxrpc_skb_rx_freed,
-        rxrpc_skb_rx_got,
-        rxrpc_skb_rx_lost,
-        rxrpc_skb_rx_purged,
-        rxrpc_skb_rx_received,
-        rxrpc_skb_rx_rotated,
-        rxrpc_skb_rx_seen,
-        rxrpc_skb_tx_cleaned,
-        rxrpc_skb_tx_freed,
-        rxrpc_skb_tx_got,
-        rxrpc_skb_tx_new,
-        rxrpc_skb_tx_rotated,
-        rxrpc_skb_tx_seen,
+        rxrpc_skb_cleaned,
+        rxrpc_skb_freed,
+        rxrpc_skb_got,
+        rxrpc_skb_lost,
+        rxrpc_skb_new,
+        rxrpc_skb_purged,
+        rxrpc_skb_received,
+        rxrpc_skb_rotated,
+        rxrpc_skb_seen,
+        rxrpc_skb_unshared,
+        rxrpc_skb_unshared_nomem,
 };
 
 enum rxrpc_local_trace {
@@ -228,20 +225,17 @@ enum rxrpc_tx_point {
  * Declare tracing information enums and their string mappings for display.
  */
 #define rxrpc_skb_traces \
-        EM(rxrpc_skb_rx_cleaned,                "Rx CLN") \
-        EM(rxrpc_skb_rx_freed,                  "Rx FRE") \
-        EM(rxrpc_skb_rx_got,                    "Rx GOT") \
-        EM(rxrpc_skb_rx_lost,                   "Rx *L*") \
-        EM(rxrpc_skb_rx_purged,                 "Rx PUR") \
-        EM(rxrpc_skb_rx_received,               "Rx RCV") \
-        EM(rxrpc_skb_rx_rotated,                "Rx ROT") \
-        EM(rxrpc_skb_rx_seen,                   "Rx SEE") \
-        EM(rxrpc_skb_tx_cleaned,                "Tx CLN") \
-        EM(rxrpc_skb_tx_freed,                  "Tx FRE") \
-        EM(rxrpc_skb_tx_got,                    "Tx GOT") \
-        EM(rxrpc_skb_tx_new,                    "Tx NEW") \
-        EM(rxrpc_skb_tx_rotated,                "Tx ROT") \
-        E_(rxrpc_skb_tx_seen,                   "Tx SEE")
+        EM(rxrpc_skb_cleaned,                   "CLN") \
+        EM(rxrpc_skb_freed,                     "FRE") \
+        EM(rxrpc_skb_got,                       "GOT") \
+        EM(rxrpc_skb_lost,                      "*L*") \
+        EM(rxrpc_skb_new,                       "NEW") \
+        EM(rxrpc_skb_purged,                    "PUR") \
+        EM(rxrpc_skb_received,                  "RCV") \
+        EM(rxrpc_skb_rotated,                   "ROT") \
+        EM(rxrpc_skb_seen,                      "SEE") \
+        EM(rxrpc_skb_unshared,                  "UNS") \
+        E_(rxrpc_skb_unshared_nomem,            "US0")
 
 #define rxrpc_local_traces \
         EM(rxrpc_local_got,                     "GOT") \
@@ -498,10 +492,10 @@ rxrpc_tx_points;
 #define E_(a, b)        { a, b }
 
 TRACE_EVENT(rxrpc_local,
-            TP_PROTO(struct rxrpc_local *local, enum rxrpc_local_trace op,
+            TP_PROTO(unsigned int local_debug_id, enum rxrpc_local_trace op,
                      int usage, const void *where),
 
-            TP_ARGS(local, op, usage, where),
+            TP_ARGS(local_debug_id, op, usage, where),
 
             TP_STRUCT__entry(
                     __field(unsigned int,       local           )
@@ -511,7 +505,7 @@ TRACE_EVENT(rxrpc_local,
                              ),
 
             TP_fast_assign(
-                    __entry->local = local->debug_id;
+                    __entry->local = local_debug_id;
                     __entry->op = op;
                     __entry->usage = usage;
                     __entry->where = where;
@@ -643,13 +637,14 @@ TRACE_EVENT(rxrpc_call,
 
 TRACE_EVENT(rxrpc_skb,
             TP_PROTO(struct sk_buff *skb, enum rxrpc_skb_trace op,
-                     int usage, int mod_count, const void *where),
+                     int usage, int mod_count, u8 flags,    const void *where),
 
-            TP_ARGS(skb, op, usage, mod_count, where),
+            TP_ARGS(skb, op, usage, mod_count, flags, where),
 
             TP_STRUCT__entry(
                     __field(struct sk_buff *,           skb             )
                     __field(enum rxrpc_skb_trace,       op              )
+                    __field(u8,                         flags           )
                     __field(int,                        usage           )
                     __field(int,                        mod_count       )
                     __field(const void *,               where           )
@@ -657,14 +652,16 @@ TRACE_EVENT(rxrpc_skb,
 
             TP_fast_assign(
                     __entry->skb = skb;
+                    __entry->flags = flags;
                     __entry->op = op;
                     __entry->usage = usage;
                     __entry->mod_count = mod_count;
                     __entry->where = where;
                            ),
 
-            TP_printk("s=%p %s u=%d m=%d p=%pSR",
+            TP_printk("s=%p %cx %s u=%d m=%d p=%pSR",
                       __entry->skb,
+                      __entry->flags & RXRPC_SKB_TX_BUFFER ? 'T' : 'R',
                       __print_symbolic(__entry->op, rxrpc_skb_traces),
                       __entry->usage,
                       __entry->mod_count,
diff --git a/include/trace/events/tegra_apb_dma.h b/include/trace/events/tegra_apb_dma.h
index 0818f6286110..971cd02d2daf 100644
--- a/include/trace/events/tegra_apb_dma.h
+++ b/include/trace/events/tegra_apb_dma.h
@@ -1,5 +1,5 @@
 #if !defined(_TRACE_TEGRA_APB_DMA_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_TEGRA_APM_DMA_H
+#define _TRACE_TEGRA_APB_DMA_H
 
 #include <linux/tracepoint.h>
 #include <linux/dmaengine.h>
@@ -55,7 +55,7 @@ TRACE_EVENT(tegra_dma_isr,
         TP_printk("%s: irq %d\n",  __get_str(chan), __entry->irq)
 );
 
-#endif /*  _TRACE_TEGRADMA_H */
+#endif /* _TRACE_TEGRA_APB_DMA_H */
 
 /* This part must be outside protection */
 #include <trace/define_trace.h>
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index fa1c753dcdbc..a5aa7d3ac6a1 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1466,8 +1466,8 @@ union bpf_attr {
  *              If no cookie has been set yet, generate a new cookie. Once
  *              generated, the socket cookie remains stable for the life of the
  *              socket. This helper can be useful for monitoring per socket
- *              networking traffic statistics as it provides a unique socket
- *              identifier per namespace.
+ *              networking traffic statistics as it provides a global socket
+ *              identifier that can be assumed unique.
  *      Return
  *              A 8-byte long non-decreasing number on success, or 0 if the
  *              socket field is missing inside *skb*.
diff --git a/include/uapi/linux/bpfilter.h b/include/uapi/linux/bpfilter.h
index 2ec3cc99ea4c..cbc1f5813f50 100644
--- a/include/uapi/linux/bpfilter.h
+++ b/include/uapi/linux/bpfilter.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_LINUX_BPFILTER_H
 #define _UAPI_LINUX_BPFILTER_H
 
diff --git a/include/uapi/linux/ipmi_bmc.h b/include/uapi/linux/ipmi_bmc.h
index 1670f0944227..782a03eb1086 100644
--- a/include/uapi/linux/ipmi_bmc.h
+++ b/include/uapi/linux/ipmi_bmc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Copyright (c) 2015-2018, Intel Corporation.
  */
diff --git a/include/uapi/linux/isst_if.h b/include/uapi/linux/isst_if.h
index d10b832c58c5..0a52b7b093d3 100644
--- a/include/uapi/linux/isst_if.h
+++ b/include/uapi/linux/isst_if.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * Intel Speed Select Interface: OS to hardware Interface
  * Copyright (c) 2019, Intel Corporation.
diff --git a/include/uapi/linux/jffs2.h b/include/uapi/linux/jffs2.h
index a18b719f49d4..784ba0b9690a 100644
--- a/include/uapi/linux/jffs2.h
+++ b/include/uapi/linux/jffs2.h
@@ -77,11 +77,6 @@
 
 #define JFFS2_ACL_VERSION               0x0001
 
-// Maybe later...
-//#define JFFS2_NODETYPE_CHECKPOINT (JFFS2_FEATURE_RWCOMPAT_DELETE | JFFS2_NODE_ACCURATE | 3)
-//#define JFFS2_NODETYPE_OPTIONS (JFFS2_FEATURE_RWCOMPAT_COPY | JFFS2_NODE_ACCURATE | 4)
-
-
 #define JFFS2_INO_FLAG_PREREAD    1     /* Do read_inode() for this one at
                                            mount time, don't wait for it to
                                            happen later */
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index 070d1bc7e725..20917c59f39c 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -410,21 +410,6 @@ struct kfd_ioctl_unmap_memory_from_gpu_args {
         __u32 n_success;                /* to/from KFD */
 };
 
-/* Allocate GWS for specific queue
- *
- * @gpu_id:      device identifier
- * @queue_id:    queue's id that GWS is allocated for
- * @num_gws:     how many GWS to allocate
- * @first_gws:   index of the first GWS allocated.
- *               only support contiguous GWS allocation
- */
-struct kfd_ioctl_alloc_queue_gws_args {
-        __u32 gpu_id;           /* to KFD */
-        __u32 queue_id;         /* to KFD */
-        __u32 num_gws;          /* to KFD */
-        __u32 first_gws;        /* from KFD */
-};
-
 struct kfd_ioctl_get_dmabuf_info_args {
         __u64 size;             /* from KFD */
         __u64 metadata_ptr;     /* to KFD */
@@ -544,10 +529,7 @@ enum kfd_mmio_remap {
 #define AMDKFD_IOC_IMPORT_DMABUF                \
                 AMDKFD_IOWR(0x1D, struct kfd_ioctl_import_dmabuf_args)
 
-#define AMDKFD_IOC_ALLOC_QUEUE_GWS              \
-                AMDKFD_IOWR(0x1E, struct kfd_ioctl_alloc_queue_gws_args)
-
 #define AMDKFD_COMMAND_START            0x01
-#define AMDKFD_COMMAND_END              0x1F
+#define AMDKFD_COMMAND_END              0x1E
 
 #endif
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h
index a7c19540ce21..5e3f12d5359e 100644
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@ -116,7 +116,7 @@ struct kvm_irq_level {
          * ACPI gsi notion of irq.
          * For IA-64 (APIC model) IOAPIC0: irq 0-23; IOAPIC1: irq 24-47..
          * For X86 (standard AT mode) PIC0/1: irq 0-15. IOAPIC0: 0-23..
-         * For ARM: See Documentation/virtual/kvm/api.txt
+         * For ARM: See Documentation/virt/kvm/api.txt
          */
         union {
                 __u32 irq;
@@ -1086,7 +1086,7 @@ struct kvm_xen_hvm_config {
  *
  * KVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies
  * the irqfd to operate in resampling mode for level triggered interrupt
- * emulation.  See Documentation/virtual/kvm/api.txt.
+ * emulation.  See Documentation/virt/kvm/api.txt.
  */
 #define KVM_IRQFD_FLAG_RESAMPLE (1 << 1)
 
diff --git a/include/uapi/linux/netfilter/nf_synproxy.h b/include/uapi/linux/netfilter/nf_synproxy.h
index 6f3791c8946f..00d787f0260e 100644
--- a/include/uapi/linux/netfilter/nf_synproxy.h
+++ b/include/uapi/linux/netfilter/nf_synproxy.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _NF_SYNPROXY_H
 #define _NF_SYNPROXY_H
 
diff --git a/include/uapi/linux/netfilter/xt_connlabel.h b/include/uapi/linux/netfilter/xt_connlabel.h
index 2312f0ec07b2..323f0dfc2a4e 100644
--- a/include/uapi/linux/netfilter/xt_connlabel.h
+++ b/include/uapi/linux/netfilter/xt_connlabel.h
@@ -1,4 +1,8 @@
 /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+
+#ifndef _UAPI_XT_CONNLABEL_H
+#define _UAPI_XT_CONNLABEL_H
+
 #include <linux/types.h>
 
 #define XT_CONNLABEL_MAXBIT 127
@@ -11,3 +15,5 @@ struct xt_connlabel_mtinfo {
         __u16 bit;
         __u16 options;
 };
+
+#endif /* _UAPI_XT_CONNLABEL_H */
diff --git a/include/uapi/linux/netfilter/xt_nfacct.h b/include/uapi/linux/netfilter/xt_nfacct.h
index 5c8a4d760ee3..b5123ab8d54a 100644
--- a/include/uapi/linux/netfilter/xt_nfacct.h
+++ b/include/uapi/linux/netfilter/xt_nfacct.h
@@ -11,4 +11,9 @@ struct xt_nfacct_match_info {
         struct nf_acct  *nfacct;
 };
 
+struct xt_nfacct_match_info_v1 {
+        char            name[NFACCT_NAME_MAX];
+        struct nf_acct  *nfacct __attribute__((aligned(8)));
+};
+
 #endif /* _XT_NFACCT_MATCH_H */
diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h
index 75758ec26c8b..beb9a9d0c00a 100644
--- a/include/uapi/linux/nl80211.h
+++ b/include/uapi/linux/nl80211.h
@@ -2863,7 +2863,7 @@ enum nl80211_attrs {
 #define NL80211_HT_CAPABILITY_LEN               26
 #define NL80211_VHT_CAPABILITY_LEN              12
 #define NL80211_HE_MIN_CAPABILITY_LEN           16
-#define NL80211_HE_MAX_CAPABILITY_LEN           51
+#define NL80211_HE_MAX_CAPABILITY_LEN           54
 #define NL80211_MAX_NR_CIPHER_SUITES            5
 #define NL80211_MAX_NR_AKM_SUITES               2
 
diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h
index 8654b2442f6a..592a0c1b77c9 100644
--- a/include/uapi/linux/psp-sev.h
+++ b/include/uapi/linux/psp-sev.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  * Userspace interface for AMD Secure Encrypted Virtualization (SEV)
  * platform management commands.
diff --git a/include/uapi/linux/rds.h b/include/uapi/linux/rds.h
index fd6b5f66e2c5..cba368e55863 100644
--- a/include/uapi/linux/rds.h
+++ b/include/uapi/linux/rds.h
@@ -250,6 +250,7 @@ struct rds_info_rdma_connection {
         __u32           rdma_mr_max;
         __u32           rdma_mr_size;
         __u8            tos;
+        __u8            sl;
         __u32           cache_allocs;
 };
 
@@ -265,6 +266,7 @@ struct rds6_info_rdma_connection {
         __u32           rdma_mr_max;
         __u32           rdma_mr_size;
         __u8            tos;
+        __u8            sl;
         __u32           cache_allocs;
 };
 
diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h
index 782069dcf607..4accfa7e266d 100644
--- a/include/uapi/linux/rxrpc.h
+++ b/include/uapi/linux/rxrpc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: GPL-2.0-or-later WITH Linux-syscall-note */
 /* Types and definitions for AF_RXRPC.
  *
  * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
diff --git a/include/uapi/linux/serial_core.h b/include/uapi/linux/serial_core.h
index 5642c05e0da0..3cc3af1c2ee1 100644
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@ -150,9 +150,6 @@
 
 #define PORT_PNX8XXX    70
 
-/* Hilscher netx */
-#define PORT_NETX       71
-
 /* SUN4V Hypervisor Console */
 #define PORT_SUNHV      72
 
diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h
index 8eb96021709c..c3409c8ec0dd 100644
--- a/include/uapi/linux/socket.h
+++ b/include/uapi/linux/socket.h
@@ -6,17 +6,24 @@
  * Desired design of maximum size and alignment (see RFC2553)
  */
 #define _K_SS_MAXSIZE   128     /* Implementation specific max size */
-#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
-                                /* Implementation specific desired alignment */
 
 typedef unsigned short __kernel_sa_family_t;
 
+/*
+ * The definition uses anonymous union and struct in order to control the
+ * default alignment.
+ */
 struct __kernel_sockaddr_storage {
-        __kernel_sa_family_t    ss_family;              /* address family */
-        /* Following field(s) are implementation specific */
-        char            __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
+        union {
+                struct {
+                        __kernel_sa_family_t    ss_family; /* address family */
+                        /* Following field(s) are implementation specific */
+                        char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
                                 /* space to achieve desired size, */
                                 /* _SS_MAXSIZE value minus size of ss_family */
-} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));   /* force desired alignment */
+                };
+                void *__align; /* implementation specific desired alignment */
+        };
+};
 
 #endif /* _UAPI_LINUX_SOCKET_H */
diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h
index 3c9ee3020cbb..652f169a019e 100644
--- a/include/uapi/linux/usb/g_uvc.h
+++ b/include/uapi/linux/usb/g_uvc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
 /*
  * g_uvc.h  --  USB Video Class Gadget driver API
  *
diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h
index 26f39816af14..c27289fd619a 100644
--- a/include/uapi/linux/vbox_vmmdev_types.h
+++ b/include/uapi/linux/vbox_vmmdev_types.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
 /*
  * Virtual Device for Guest <-> VMM/Host communication, type definitions
  * which are also used for the vboxguest ioctl interface / by vboxsf
diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h
index 612f0c7d3558..9cec58a6a5ea 100644
--- a/include/uapi/linux/vboxguest.h
+++ b/include/uapi/linux/vboxguest.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR CDDL-1.0) */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR CDDL-1.0) */
 /*
  * VBoxGuest - VirtualBox Guest Additions Driver Interface.
  *
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 9d9705ceda76..2427bc4d8eba 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -518,7 +518,13 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_RGBX444 v4l2_fourcc('R', 'X', '1', '2') /* 16  rrrrgggg bbbbxxxx */
 #define V4L2_PIX_FMT_ABGR444 v4l2_fourcc('A', 'B', '1', '2') /* 16  aaaabbbb ggggrrrr */
 #define V4L2_PIX_FMT_XBGR444 v4l2_fourcc('X', 'B', '1', '2') /* 16  xxxxbbbb ggggrrrr */
-#define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('B', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */
+
+/*
+ * Originally this had 'BA12' as fourcc, but this clashed with the older
+ * V4L2_PIX_FMT_SGRBG12 which inexplicably used that same fourcc.
+ * So use 'GA12' instead for V4L2_PIX_FMT_BGRA444.
+ */
+#define V4L2_PIX_FMT_BGRA444 v4l2_fourcc('G', 'A', '1', '2') /* 16  bbbbgggg rrrraaaa */
 #define V4L2_PIX_FMT_BGRX444 v4l2_fourcc('B', 'X', '1', '2') /* 16  bbbbgggg rrrrxxxx */
 #define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
 #define V4L2_PIX_FMT_ARGB555 v4l2_fourcc('A', 'R', '1', '5') /* 16  ARGB-1-5-5-5  */
diff --git a/include/uapi/linux/virtio_iommu.h b/include/uapi/linux/virtio_iommu.h
index ba1b460c9944..237e36a280cb 100644
--- a/include/uapi/linux/virtio_iommu.h
+++ b/include/uapi/linux/virtio_iommu.h
@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
- * Virtio-iommu definition v0.9
+ * Virtio-iommu definition v0.12
  *
- * Copyright (C) 2018 Arm Ltd.
+ * Copyright (C) 2019 Arm Ltd.
  */
 #ifndef _UAPI_LINUX_VIRTIO_IOMMU_H
 #define _UAPI_LINUX_VIRTIO_IOMMU_H
@@ -11,26 +11,31 @@
 
 /* Feature bits */
 #define VIRTIO_IOMMU_F_INPUT_RANGE              0
-#define VIRTIO_IOMMU_F_DOMAIN_BITS              1
+#define VIRTIO_IOMMU_F_DOMAIN_RANGE             1
 #define VIRTIO_IOMMU_F_MAP_UNMAP                2
 #define VIRTIO_IOMMU_F_BYPASS                   3
 #define VIRTIO_IOMMU_F_PROBE                    4
+#define VIRTIO_IOMMU_F_MMIO                     5
 
-struct virtio_iommu_range {
-        __u64                                   start;
-        __u64                                   end;
+struct virtio_iommu_range_64 {
+        __le64                                  start;
+        __le64                                  end;
+};
+
+struct virtio_iommu_range_32 {
+        __le32                                  start;
+        __le32                                  end;
 };
 
 struct virtio_iommu_config {
         /* Supported page sizes */
-        __u64                                   page_size_mask;
+        __le64                                  page_size_mask;
         /* Supported IOVA range */
-        struct virtio_iommu_range               input_range;
+        struct virtio_iommu_range_64            input_range;
         /* Max domain ID size */
-        __u8                                    domain_bits;
-        __u8                                    padding[3];
+        struct virtio_iommu_range_32            domain_range;
         /* Probe buffer size */
-        __u32                                   probe_size;
+        __le32                                  probe_size;
 };
 
 /* Request types */
@@ -49,6 +54,7 @@ struct virtio_iommu_config {
 #define VIRTIO_IOMMU_S_RANGE                    0x05
 #define VIRTIO_IOMMU_S_NOENT                    0x06
 #define VIRTIO_IOMMU_S_FAULT                    0x07
+#define VIRTIO_IOMMU_S_NOMEM                    0x08
 
 struct virtio_iommu_req_head {
         __u8                                    type;
@@ -78,12 +84,10 @@ struct virtio_iommu_req_detach {
 
 #define VIRTIO_IOMMU_MAP_F_READ                 (1 << 0)
 #define VIRTIO_IOMMU_MAP_F_WRITE                (1 << 1)
-#define VIRTIO_IOMMU_MAP_F_EXEC                 (1 << 2)
-#define VIRTIO_IOMMU_MAP_F_MMIO                 (1 << 3)
+#define VIRTIO_IOMMU_MAP_F_MMIO                 (1 << 2)
 
 #define VIRTIO_IOMMU_MAP_F_MASK                 (VIRTIO_IOMMU_MAP_F_READ |      \
                                                  VIRTIO_IOMMU_MAP_F_WRITE |     \
-                                                 VIRTIO_IOMMU_MAP_F_EXEC |      \
                                                  VIRTIO_IOMMU_MAP_F_MMIO)
 
 struct virtio_iommu_req_map {
diff --git a/include/uapi/linux/virtio_pmem.h b/include/uapi/linux/virtio_pmem.h
index 9a63ed6d062f..b022787ffb94 100644
--- a/include/uapi/linux/virtio_pmem.h
+++ b/include/uapi/linux/virtio_pmem.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause */
 /*
  * Definitions for virtio-pmem devices.
  *
diff --git a/include/uapi/linux/vmcore.h b/include/uapi/linux/vmcore.h
index 022619668e0e..3e9da91866ff 100644
--- a/include/uapi/linux/vmcore.h
+++ b/include/uapi/linux/vmcore.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 #ifndef _UAPI_VMCORE_H
 #define _UAPI_VMCORE_H
 
diff --git a/include/uapi/linux/wmi.h b/include/uapi/linux/wmi.h
index c36f2d7675a4..7085c5dca9fa 100644
--- a/include/uapi/linux/wmi.h
+++ b/include/uapi/linux/wmi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
+/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
 /*
  *  User API methods for ACPI-WMI mapping driver
  *
diff --git a/include/uapi/misc/fastrpc.h b/include/uapi/misc/fastrpc.h
index 6d701af9fc42..fb792e882cef 100644
--- a/include/uapi/misc/fastrpc.h
+++ b/include/uapi/misc/fastrpc.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 
 #ifndef __QCOM_FASTRPC_H__
 #define __QCOM_FASTRPC_H__
diff --git a/include/uapi/rdma/rvt-abi.h b/include/uapi/rdma/rvt-abi.h
index 7328293c715c..7c05a02d2be5 100644
--- a/include/uapi/rdma/rvt-abi.h
+++ b/include/uapi/rdma/rvt-abi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
 
 /*
  * This file contains defines, structures, etc. that are used
diff --git a/include/uapi/rdma/siw-abi.h b/include/uapi/rdma/siw-abi.h
index 3dd8071ace7b..af735f55b291 100644
--- a/include/uapi/rdma/siw-abi.h
+++ b/include/uapi/rdma/siw-abi.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 or BSD-3-Clause */
+/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) or BSD-3-Clause */
 
 /* Authors: Bernard Metzler <bmt@zurich.ibm.com> */
 /* Copyright (c) 2008-2019, IBM Corporation */
@@ -180,6 +180,7 @@ struct siw_cqe {
  * to control CQ arming.
  */
 struct siw_cq_ctrl {
-        __aligned_u64 notify;
+        __u32 flags;
+        __u32 pad;
 };
 #endif
diff --git a/include/uapi/scsi/scsi_bsg_ufs.h b/include/uapi/scsi/scsi_bsg_ufs.h
index 17c7abd0803a..9988db6ad244 100644
--- a/include/uapi/scsi/scsi_bsg_ufs.h
+++ b/include/uapi/scsi/scsi_bsg_ufs.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * UFS Transport SGIO v4 BSG Message Support
  *
diff --git a/include/uapi/sound/skl-tplg-interface.h b/include/uapi/sound/skl-tplg-interface.h
index f39352cef382..9eee32f5e407 100644
--- a/include/uapi/sound/skl-tplg-interface.h
+++ b/include/uapi/sound/skl-tplg-interface.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 /*
  * skl-tplg-interface.h - Intel DSP FW private data interface
  *
diff --git a/include/uapi/sound/sof/abi.h b/include/uapi/sound/sof/abi.h
index 4a9c24434f42..a0fe0d4c4b66 100644
--- a/include/uapi/sound/sof/abi.h
+++ b/include/uapi/sound/sof/abi.h
@@ -26,7 +26,7 @@
 
 /* SOF ABI version major, minor and patch numbers */
 #define SOF_ABI_MAJOR 3
-#define SOF_ABI_MINOR 8
+#define SOF_ABI_MINOR 10
 #define SOF_ABI_PATCH 0
 
 /* SOF ABI version number. Format within 32bit word is MMmmmppp */
diff --git a/include/uapi/sound/sof/tokens.h b/include/uapi/sound/sof/tokens.h
index dc1b27daaac6..8f996857fb24 100644
--- a/include/uapi/sound/sof/tokens.h
+++ b/include/uapi/sound/sof/tokens.h
@@ -75,6 +75,7 @@
 #define SOF_TKN_INTEL_SSP_FRAME_PULSE_WIDTH     503
 #define SOF_TKN_INTEL_SSP_QUIRKS                504
 #define SOF_TKN_INTEL_SSP_TDM_PADDING_PER_SLOT  505
+#define SOF_TKN_INTEL_SSP_BCLK_DELAY            506
 
 /* DMIC */
 #define SOF_TKN_INTEL_DMIC_DRIVER_VERSION       600
@@ -105,4 +106,12 @@
 /* for backward compatibility */
 #define SOF_TKN_EFFECT_TYPE     SOF_TKN_PROCESS_TYPE
 
+/* SAI */
+#define SOF_TKN_IMX_SAI_FIRST_TOKEN             1000
+/* TODO: Add SAI tokens */
+
+/* ESAI */
+#define SOF_TKN_IMX_ESAI_FIRST_TOKEN            1100
+/* TODO: Add ESAI tokens */
+
 #endif
diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h
index 4969817124a8..98b30c1613b2 100644
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h
@@ -109,6 +109,9 @@ static inline int xen_xlate_unmap_gfn_range(struct vm_area_struct *vma,
 }
 #endif
 
+int xen_remap_vma_range(struct vm_area_struct *vma, unsigned long addr,
+                        unsigned long len);
+
 /*
  * xen_remap_domain_gfn_array() - map an array of foreign frames by gfn
  * @vma:     VMA to map the pages into