Merge branch 'acpi-hotplug' into linux-next

* acpi-hotplug:
  ACPI / cpufreq: Add ACPI processor device IDs to acpi-cpufreq
  Memory hotplug: Move alternative function definitions to header
  ACPI / processor: Fix potential NULL pointer dereference in acpi_processor_add()
  Memory hotplug / ACPI: Simplify memory removal
  ACPI / scan: Add second pass of companion offlining to hot-remove code
  Driver core / MM: Drop offline_memory_block()
  ACPI / processor: Pass processor object handle to acpi_bind_one()
  ACPI: Drop removal_type field from struct acpi_device
  Driver core / memory: Simplify __memory_block_change_state()
  ACPI / processor: Initialize per_cpu(processors, pr->id) properly
  CPU: Fix sysfs cpu/online of offlined CPUs
  Driver core: Introduce offline/online callbacks for memory blocks
  ACPI / memhotplug: Bind removable memory blocks to ACPI device nodes
  ACPI / processor: Use common hotplug infrastructure
  ACPI / hotplug: Use device offline/online for graceful hot-removal
  Driver core: Use generic offline/online for CPU offline/online
  Driver core: Add offline/online device operations

diff --cc drivers/acpi/Makefile
Simple merge

diff --cc drivers/acpi/internal.h
index 297cbf456f86bee35300ef6c72058615663f563f,bf792595132cb586aabd761a79d0eb68a00eef60..18a9d2230a8bed3dfd75b31dcfdbb1dfcca9b7b5
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -33,8 -33,10 +33,9 @@@ static inline void acpi_pci_slot_init(v
  void acpi_pci_root_init(void);
  void acpi_pci_link_init(void);
  void acpi_pci_root_hp_init(void);
+ void acpi_processor_init(void);
  void acpi_platform_init(void);
  int acpi_sysfs_init(void);
 -void acpi_csrt_init(void);
  #ifdef CONFIG_ACPI_CONTAINER
  void acpi_container_init(void);
  #else

diff --cc drivers/acpi/scan.c
index b14ac46948c9e444246eba50e367ed1a16399ea2,2959fe1ce43e71203ea440279d9869a959ffee1c..f3f1718836d8f2cbd248e9206ccc1b1f6ec5258b
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -2038,8 -2155,10 +2153,9 @@@ int __init acpi_scan_init(void
  
        acpi_pci_root_init();
        acpi_pci_link_init();
+       acpi_processor_init();
        acpi_platform_init();
        acpi_lpss_init();
 -      acpi_csrt_init();
        acpi_container_init();
        acpi_memory_hotplug_init();
  

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/cpufreq/acpi-cpufreq.c
Simple merge

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

diff --cc mm/memory_hotplug.c
Simple merge