diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 22:07:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 22:07:02 +0200 |
commit | 6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e (patch) | |
tree | ad5838e0b8ecb22bc5d78fb476d1569ecbe82372 /kernel/Kconfig.hz | |
parent | Merge tag 'hsi-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/sre... (diff) | |
parent | ipmi/watchdog: fix wdog hang on panic waiting for ipmi response (diff) | |
download | linux-6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e.tar.xz linux-6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e.zip |
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()
Diffstat (limited to 'kernel/Kconfig.hz')
0 files changed, 0 insertions, 0 deletions