diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-25 15:16:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-25 15:16:51 -0800 |
| commit | beb53e4b2328b0947622dd1bf407295bf1d9b436 (patch) | |
| tree | b2c113e4df761fcf4727069a46485cec1a922957 /net/ipv4/fib_frontend.c | |
| parent | 686564434e88b67ea8dbbf9150286d04c83bd193 (diff) | |
| parent | 7e5c07af8693e72b23aefb70da88b31b30c35b22 (diff) | |
| download | blackbird-obmc-linux-beb53e4b2328b0947622dd1bf407295bf1d9b436.tar.gz blackbird-obmc-linux-beb53e4b2328b0947622dd1bf407295bf1d9b436.zip | |
Merge tag 'acpi-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"Two ACPI fixes for 4.9-rc7.
One of them reverts a recent ACPI commit that attempted to improve
reboot/power-off on some systems, but introduced problems elsewhere,
and the other one fixes kernel builds with the new WDAT watchdog
driver enabled in some configurations.
Specifics:
- Revert the recent commit that caused the ACPI _PTS method to be
executed in the power-off/reboot code path (as per the
specification) in an attempt to improve things on some systems
(apparently expecting _PTS to be executed in that code path), but
broke power-off/reboot on at least one other machine (Rafael
Wysocki).
- Fix kernel builds with the new WDAT watchdog driver enabled in some
configurations by explicitly selecting WATCHDOG_CORE when enabling
the WDAT watchdog driver (Mika Westerberg)"
* tag 'acpi-4.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
watchdog: wdat_wdt: Select WATCHDOG_CORE
Revert "ACPI: Execute _PTS before system reboot"
Diffstat (limited to 'net/ipv4/fib_frontend.c')
0 files changed, 0 insertions, 0 deletions
