Merge branches 'acpi-dptf' and 'acpi-messages'

* acpi-dptf:
  ACPI: DPTF: Add battery participant for Intel SoCs

* acpi-messages:
  ACPI: Remove the macro PREFIX "ACPI: "
  ACPI: sleep: Unify the message printing
  ACPI: sbs: Unify the message printing
  ACPI: scan: Unify the log message printing
  ACPI: sbshc: Unify the message printing
  ACPI: sysfs: Cleanup message printing
  ACPI: reboot: Unify the message printing
  ACPI: processor_throttling: Cleanup the printing messages
  ACPI: processor_perflib: Cleanup print messages
  ACPI: processor_thermal: Remove unused PREFIX for printing
  ACPI: pci_root: Unify the message printing
  ACPI: osl: Remove the duplicated PREFIX for message printing
  ACPI: nvs: Unify the message printing
  ACPI: glue: Clean up the printing messages
  ACPI: event: Use pr_*() macros to replace printk()
  ACPI: bus: Use pr_*() macros to replace printk()
  ACPI: blacklist: Unify the message printing
  ACPI: cmos_rtc: Using pr_fmt() and remove PREFIX

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

diff --cc drivers/acpi/internal.h
index 00f4e28c3af75a68cbf11cc93f60606e3e1e0d81,b852cff8028725fac360e6d2a04de3632876879d,bbe1064a74954fe49fe131456fe18431d540b8b2..b1d2cc342014594cd6204b3dadc8803ce832346e
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
--- 3/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@@ -142,7 -142,6 -140,7 +140,7 @@@@ int acpi_device_sleep_wake(struct acpi_
   int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
   int acpi_power_on_resources(struct acpi_device *device, int state);
   int acpi_power_transition(struct acpi_device *device, int state);
  -void acpi_turn_off_unused_power_resources(bool init);
 ++void acpi_turn_off_unused_power_resources(void);
   
   /* --------------------------------------------------------------------------
                                 Device Power Management

diff --cc drivers/acpi/processor_throttling.c
index dbccc92e81e78ef81cbf60c167b0b0a990c7ef1d,e61b8f038364bb5c0414c5ef4c09480479db02f2,0086afe7d65dd21c2f74af10c9de0a4183c652f4..a822fe410dda01387db768fa7f2b080bcbbdbb49
--- 1/drivers/acpi/processor_throttling.c
--- 2/drivers/acpi/processor_throttling.c
--- 3/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@@@ -6,9 -6,9 -6,11 +6,11 @@@@
    *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
    *  Copyright (C) 2004       Dominik Brodowski <linux@brodo.de>
    *  Copyright (C) 2004  Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 -- *                   - Added processor hotplug support
 ++ *                      - Added processor hotplug support
    */
   
++ #define pr_fmt(fmt) "ACPI: " fmt
++ 
   #include <linux/kernel.h>
   #include <linux/module.h>
   #include <linux/slab.h>

diff --cc drivers/acpi/scan.c
index f8eaddb834845e1db8cc5c3bde4ba21224573aec,a22778e880c22e58c5f5e74629666c5a033e9482,0c916c18a2505180d69acd4c43513cd7add6a361..57507b643afded99e4bef429d41ff9f95688a55d
--- 1/drivers/acpi/scan.c
--- 2/drivers/acpi/scan.c
--- 3/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@@ -2485,8 -2359,6 -2361,8 +2486,8 @@@@ int __init acpi_scan_init(void
                }
        }
   
  -     acpi_turn_off_unused_power_resources(true);
 ++     acpi_turn_off_unused_power_resources();
 + 
        acpi_scan_initialized = true;
   
    out:

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

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