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

diff --cc Documentation/admin-guide/kernel-parameters.rst
Simple merge

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

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/dra7-l4.dtsi
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/x86/events/amd/iommu.h
Simple merge

diff --cc arch/x86/kernel/machine_kexec_64.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kvm/vmx/vmx.c
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/clocksource/arm_arch_timer.c
index 932f95691e27e53c79c77bbb55ecc700f1758991,1b885964fb34d2e8c4541dbb64ab83e98ad2db97..4fb1f4da27ec0997bd3cdfc3474c696952aec819
--- 1/drivers/clocksource/arm_arch_timer.c
--- 2/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@@ -60,23 -60,16 +60,24 @@@ struct arch_timer 
  
  #define to_arch_timer(e) container_of(e, struct arch_timer, evt)
  
- static u32 arch_timer_rate;
- static int arch_timer_ppi[ARCH_TIMER_MAX_TIMER_PPI];
+ static u32 arch_timer_rate __ro_after_init;
+ u32 arch_timer_rate1 __ro_after_init;
+ static int arch_timer_ppi[ARCH_TIMER_MAX_TIMER_PPI] __ro_after_init;
  
 +static const char *arch_timer_ppi_names[ARCH_TIMER_MAX_TIMER_PPI] = {
 +      [ARCH_TIMER_PHYS_SECURE_PPI]    = "sec-phys",
 +      [ARCH_TIMER_PHYS_NONSECURE_PPI] = "phys",
 +      [ARCH_TIMER_VIRT_PPI]           = "virt",
 +      [ARCH_TIMER_HYP_PPI]            = "hyp-phys",
 +      [ARCH_TIMER_HYP_VIRT_PPI]       = "hyp-virt",
 +};
 +
  static struct clock_event_device __percpu *arch_timer_evt;
  
- static enum arch_timer_ppi_nr arch_timer_uses_ppi = ARCH_TIMER_VIRT_PPI;
- static bool arch_timer_c3stop;
- static bool arch_timer_mem_use_virtual;
- static bool arch_counter_suspend_stop;
+ static enum arch_timer_ppi_nr arch_timer_uses_ppi __ro_after_init = ARCH_TIMER_VIRT_PPI;
+ static bool arch_timer_c3stop __ro_after_init;
+ static bool arch_timer_mem_use_virtual __ro_after_init;
+ static bool arch_counter_suspend_stop __ro_after_init;
  #ifdef CONFIG_GENERIC_GETTIMEOFDAY
  static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_ARCHTIMER;
  #else

diff --cc drivers/net/ethernet/dlink/sundance.c
Simple merge

diff --cc drivers/pci/controller/pci-hyperv.c
Simple merge

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

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

diff --cc include/linux/lockdep.h
index 1c746139d5e31b605406249d81ac64339b4216d2,09ac2e8348d2b40f2a98d9b169e74149a9f76272..5cf38781375499e1db44ddaefdf554934d271730
--- 1/include/linux/lockdep.h
--- 2/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@@ -397,10 -404,10 +408,11 @@@ extern int lockdep_is_held(const void *
  #define lockdep_is_held_type(l, r)            (1)
  
  #define lockdep_assert_held(l)                        do { (void)(l); } while (0)
- #define lockdep_assert_held_write(l)  do { (void)(l); } while (0)
+ #define lockdep_assert_not_held(l)            do { (void)(l); } while (0)
+ #define lockdep_assert_held_write(l)          do { (void)(l); } while (0)
  #define lockdep_assert_held_read(l)           do { (void)(l); } while (0)
  #define lockdep_assert_held_once(l)           do { (void)(l); } while (0)
 +#define lockdep_assert_none_held_once()       do { } while (0)
  
  #define lockdep_recursing(tsk)                        (0)
  

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

diff --cc kernel/locking/lockdep.c
Simple merge

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

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

diff --cc kernel/time/tick-sched.c
Simple merge

diff --cc mm/slub.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/mac80211/iface.c
Simple merge