Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull SMP hotplug notifier removal from Thomas Gleixner:
 "This is the final cleanup of the hotplug notifier infrastructure. The
  series has been reintgrated in the last two days because there came a
  new driver using the old infrastructure via the SCSI tree.

  Summary:

   - convert the last leftover drivers utilizing notifiers

   - fixup for a completely broken hotplug user

   - prevent setup of already used states

   - removal of the notifiers

   - treewide cleanup of hotplug state names

   - consolidation of state space

  There is a sphinx based documentation pending, but that needs review
  from the documentation folks"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/armada-xp: Consolidate hotplug state space
  irqchip/gic: Consolidate hotplug state space
  coresight/etm3/4x: Consolidate hotplug state space
  cpu/hotplug: Cleanup state names
  cpu/hotplug: Remove obsolete cpu hotplug register/unregister functions
  staging/lustre/libcfs: Convert to hotplug state machine
  scsi/bnx2i: Convert to hotplug state machine
  scsi/bnx2fc: Convert to hotplug state machine
  cpu/hotplug: Prevent overwriting of callbacks
  x86/msr: Remove bogus cleanup from the error path
  bus: arm-ccn: Prevent hotplug callback leak
  perf/x86/intel/cstate: Prevent hotplug callback leak
  ARM/imx/mmcd: Fix broken cpu hotplug handling
  scsi: qedi: Convert to hotplug state machine

diff --combined arch/arm64/kernel/armv8_deprecated.c
index fde04f029ec34171fe0a0683f10ebb84a0ee8582,a211addeb6bc064a88bc42b5c32e3a91488d1edf..ecf9298a12d48f11d5833dca0584d8ab028cf422
--- 1/arch/arm64/kernel/armv8_deprecated.c
--- 2/arch/arm64/kernel/armv8_deprecated.c
+++ b/arch/arm64/kernel/armv8_deprecated.c
@@@ -19,7 -19,7 +19,7 @@@
  #include <asm/sysreg.h>
  #include <asm/system_misc.h>
  #include <asm/traps.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
  #include <asm/cpufeature.h>
  
  #define CREATE_TRACE_POINTS
@@@ -640,7 -640,7 +640,7 @@@ static int __init armv8_deprecated_init
        }
  
        cpuhp_setup_state_nocalls(CPUHP_AP_ARM64_ISNDEP_STARTING,
-                                 "AP_ARM64_ISNDEP_STARTING",
+                                 "arm64/isndep:starting",
                                  run_all_insn_set_hw_mode, NULL);
        register_insn_emulation_sysctl(ctl_abi);
  

diff --combined arch/mips/oprofile/op_model_loongson3.c
index 40660392006f2bf2ec4f59f7aca3ad3ff1a426d7,d60d97b6113d11b1a2649a5a95f68c404201a594..436b1fc99f2ca82a9f994cd465f1e3a742659fd1
--- 1/arch/mips/oprofile/op_model_loongson3.c
--- 2/arch/mips/oprofile/op_model_loongson3.c
+++ b/arch/mips/oprofile/op_model_loongson3.c
@@@ -11,7 -11,7 +11,7 @@@
  #include <linux/oprofile.h>
  #include <linux/spinlock.h>
  #include <linux/interrupt.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
  #include <irq.h>
  #include <loongson.h>
  #include "op_impl.h"
@@@ -186,7 -186,7 +186,7 @@@ static int __init loongson3_init(void
  {
        on_each_cpu(reset_counters, NULL, 1);
        cpuhp_setup_state_nocalls(CPUHP_AP_MIPS_OP_LOONGSON3_STARTING,
-                                 "AP_MIPS_OP_LOONGSON3_STARTING",
+                                 "mips/oprofile/loongson3:starting",
                                  loongson3_starting_cpu, loongson3_dying_cpu);
        save_perf_irq = perf_irq;
        perf_irq = loongson3_perfcount_handler;

diff --combined virt/kvm/kvm_main.c
index 994f81f8eecb67fed42c5fba956c163d22640239,ec298b7ca556e5c3e66f85bb77b334cd86182d1f..482612b4e496f92527d5191a2a8adfa5962e4de8
--- 1/virt/kvm/kvm_main.c
--- 2/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@@ -53,7 -53,7 +53,7 @@@
  #include <asm/processor.h>
  #include <asm/io.h>
  #include <asm/ioctl.h>
 -#include <asm/uaccess.h>
 +#include <linux/uaccess.h>
  #include <asm/pgtable.h>
  
  #include "coalesced_mmio.h"
@@@ -3944,7 -3944,7 +3944,7 @@@ int kvm_init(void *opaque, unsigned vcp
                        goto out_free_1;
        }
  
-       r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_STARTING, "AP_KVM_STARTING",
+       r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_STARTING, "kvm/cpu:starting",
                                      kvm_starting_cpu, kvm_dying_cpu);
        if (r)
                goto out_free_2;