From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 May 2017 20:07:02 +0000 (-0700)
Subject: Merge tag 'for-linux-4.12' of git://github.com/cminyard/linux-ipmi
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e;p=openwrt%2Fstaging%2Fblogic.git

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()
---

6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e