diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-26 11:06:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-26 11:06:36 -0700 |
commit | fe03a7594d86e0754f05e604cd803a6a9aae3c1c (patch) | |
tree | 14b12789b85472ac19cb5dbd98f5aa13c6520dd4 /tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc | |
parent | e58d911f98690db97a7ad93d2ecf5ebf0733fb5f (diff) | |
parent | bd6dff55de7acb2e5065e69706400c41b1bd0521 (diff) |
Merge tag 'acpi-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These are two watchdog-related fixes, fix for a backlight regression
from the 4.16 cycle that unfortunately was propagated to -stable and a
button module modification to prevent graphics driver modules from
failing to load due to unmet dependencies if ACPI is disabled from the
kernel command line.
Specifics:
- Change the ACPI subsystem initialization ordering to initialize the
WDAT watchodg before reserving PNP motherboard resources so as to
allow the watchdog to allocate its resources before the PNP code
gets to them and prevents it from working correctly (Mika
Westerberg).
- Add a quirk for Lenovo Z50-70 to use the iTCO watchdog instead of
the WDAT one which conflicts with the RTC on that platform (Mika
Westerberg).
- Avoid breaking backlight handling on Dell XPS 13 2013 model by
allowing laptops to use the ACPI backlight by default even if they
are Windows 8-ready in principle (Hans de Goede)"
* tag 'acpi-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / video: Only default only_lcd to true on Win8-ready _desktops_
ACPI / button: make module loadable when booted in non-ACPI mode
ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
ACPI / scan: Initialize watchdog before PNP
Diffstat (limited to 'tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc')
0 files changed, 0 insertions, 0 deletions