Merge branch 'acpi-ipmi'

* acpi-ipmi:
  ACPI / IPMI: Cleanup coding styles
  ACPI / IPMI: Cleanup some Kconfig codes
  ACPI / IPMI: Cleanup some inclusion codes
  ACPI / IPMI: Cleanup some initialization codes
  ACPI / IPMI: Cleanup several acpi_ipmi_device members
  ACPI / IPMI: Add reference counting for ACPI IPMI transfers
  ACPI / IPMI: Use global IPMI operation region handler
  ACPI / IPMI: Fix race caused by the unprotected ACPI IPMI user
  ACPI / IPMI: Fix race caused by the timed out ACPI IPMI transfers
  ACPI / IPMI: Fix race caused by the unprotected ACPI IPMI transfers
  ACPI / IPMI: Fix potential response buffer overflow

diff --combined drivers/acpi/Kconfig
index 10e399f97189bac20cf89401250e94f2a081ad64,d130e2c115cc0a2882e2fd43584b9c788e504861..589da059ce3939c9a2139907daefbf00a5a9b0e2
--- 1/drivers/acpi/Kconfig
--- 2/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@@ -24,7 -24,7 +24,7 @@@ menuconfig ACP
          are configured, ACPI is used.
  
          The project home page for the Linux ACPI subsystem is here:
 -        <http://www.lesswatts.org/projects/acpi/>
 +        <https://01.org/linux-acpi>
  
          Linux support for ACPI is based on Intel Corporation's ACPI
          Component Architecture (ACPI CA).  For more information on the
@@@ -56,6 -56,23 +56,6 @@@ config ACPI_PROCF
  
          Say N to delete /proc/acpi/ files that have moved to /sys/
  
 -config ACPI_PROCFS_POWER
 -      bool "Deprecated power /proc/acpi directories"
 -      depends on PROC_FS
 -      help
 -        For backwards compatibility, this option allows
 -          deprecated power /proc/acpi/ directories to exist, even when
 -          they have been replaced by functions in /sys.
 -          The deprecated directories (and their replacements) include:
 -        /proc/acpi/battery/* (/sys/class/power_supply/*)
 -        /proc/acpi/ac_adapter/* (sys/class/power_supply/*)
 -        This option has no effect on /proc/acpi/ directories
 -        and functions, which do not yet exist in /sys
 -        This option, together with the proc directories, will be
 -        deleted in 2.6.39.
 -
 -        Say N to delete power /proc/acpi/ directories that have moved to /sys/
 -
  config ACPI_EC_DEBUGFS
        tristate "EC read/write access through /sys/kernel/debug/ec"
        default n
@@@ -106,9 -123,9 +106,9 @@@ config ACPI_BUTTO
        default y
        help
          This driver handles events on the power, sleep, and lid buttons.
 -        A daemon reads /proc/acpi/event and perform user-defined actions
 -        such as shutting down the system.  This is necessary for
 -        software-controlled poweroff.
 +        A daemon reads events from input devices or via netlink and
 +        performs user-defined actions such as shutting down the system.
 +        This is necessary for software-controlled poweroff.
  
          To compile this driver as a module, choose M here:
          the module will be called button.
@@@ -158,9 -175,10 +158,10 @@@ config ACPI_PROCESSO
  
          To compile this driver as a module, choose M here:
          the module will be called processor.
+ 
  config ACPI_IPMI
        tristate "IPMI"
-       depends on IPMI_SI && IPMI_HANDLER
+       depends on IPMI_SI
        default n
        help
          This driver enables the ACPI to access the BMC controller. And it