Merge remote-tracking branch 'tip/auto-latest'

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/x86/entry/entry_32.S
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc arch/x86/kernel/head_32.S
Simple merge

diff --cc arch/x86/kernel/head_64.S
Simple merge

diff --cc arch/x86/lib/memcpy_64.S
index 94c917af968801c643f396d64f051598f24e4e15,49e6ebac7e73e33b0a03327cb65c95a29afc1c67..779782f5832476582becc24e5a0f0f5b10ea0b53
--- 1/arch/x86/lib/memcpy_64.S
--- 2/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@@ -276,8 -273,7 +276,8 @@@ ENTRY(memcpy_mcsafe_unrolled
  .L_done_memcpy_trap:
        xorq %rax, %rax
        ret
- ENDPROC(memcpy_mcsafe)
- EXPORT_SYMBOL_GPL(memcpy_mcsafe)
+ ENDPROC(memcpy_mcsafe_unrolled)
++EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled)
  
        .section .fixup, "ax"
        /* Return -EFAULT for any failure */

diff --cc drivers/acpi/internal.h
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/perf/arm_pmu.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/cpu.h
Simple merge

diff --cc include/linux/cpuhotplug.h
Simple merge

diff --cc include/linux/jump_label.h
index a534c7f15a615520d802a78a82fe55d2af8e4cae,595fb46213fc4ae79965af911786b63784cbffd8..a0547c571800e7ca77f9a7ffed9412a16bee9262
--- 1/include/linux/jump_label.h
--- 2/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@@ -272,16 -273,9 +275,19 @@@ struct static_key_false 
  #define DEFINE_STATIC_KEY_FALSE(name) \
        struct static_key_false name = STATIC_KEY_FALSE_INIT
  
+ #define DECLARE_STATIC_KEY_FALSE(name)        \
+       extern struct static_key_false name
+ 
 +#define DEFINE_STATIC_KEY_ARRAY_TRUE(name, count)             \
 +      struct static_key_true name[count] = {                  \
 +              [0 ... (count) - 1] = STATIC_KEY_TRUE_INIT,     \
 +      }
 +
 +#define DEFINE_STATIC_KEY_ARRAY_FALSE(name, count)            \
 +      struct static_key_false name[count] = {                 \
 +              [0 ... (count) - 1] = STATIC_KEY_FALSE_INIT,    \
 +      }
 +
  extern bool ____wrong_branch_error(void);
  
  #define static_key_enabled(x)                                                 \

diff --cc include/linux/perf/arm_pmu.h
index dc1f2f30c961e3b0174527d75867df67c8f5878a,4ad1b408c0bba6766587338edb22039be90bb85b..05d46ddb6f568ad2b3d8a8097f0d02f42d7f40b3
--- 1/include/linux/perf/arm_pmu.h
--- 2/include/linux/perf/arm_pmu.h
+++ b/include/linux/perf/arm_pmu.h
@@@ -116,10 -109,8 +116,10 @@@ struct arm_pmu 
        DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS);
        struct platform_device  *plat_device;
        struct pmu_hw_events    __percpu *hw_events;
-       struct list_head        entry;
+       struct hlist_node       node;
        struct notifier_block   cpu_pm_nb;
 +      /* the attr_groups array must be NULL-terminated */
 +      const struct attribute_group *attr_groups[ARMPMU_NR_ATTR_GROUPS + 1];
  };
  
  #define to_arm_pmu(p) (container_of(p, struct arm_pmu, pmu))

diff --cc include/linux/perf_event.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/cpu.c
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched/deadline.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge

diff --cc kernel/softirq.c
Simple merge