Merge tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 May 2017 20:07:02 +0000 (13:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 May 2017 20:07:02 +0000 (13:07 -0700)
commit6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e
treead5838e0b8ecb22bc5d78fb476d1569ecbe82372
parent5c6ba7d53274b5e8b13ecbc727d8eb1ea4a2bcdc
parent2c1175c2e8e5487233cabde358a19577562ac83e
Merge tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi

Pull IPMI updates from Corey Minyard:
 "A few fixes of things in the IPMI area, the watchdog would have issues
  at panic time cause by a recently introduced change, a problem with
  device numbering, one possible panic in the I2C driver (destined for
  stable).

  Nothing earth-shattering, but some things that need to go in"

* tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi:
  ipmi/watchdog: fix wdog hang on panic waiting for ipmi response
  ipmi_si: use smi_num for init_name
  ipmi: bt-bmc: Add ast2500 compatible string
  ACPI / IPMI: change warning to debug on timeout
  ACPI / IPMI: allow ACPI_IPMI with IPMI_SSIF
  ipmi_ssif: use setup_timer
  ipmi: Fix kernel panic at ipmi_ssif_thread()
drivers/acpi/Kconfig