diff options
| author | Linus Torvalds <[email protected]> | 2021-09-08 23:33:21 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2021-09-08 23:33:21 +0000 |
| commit | 9c566611ac5cc7b45af943632f7a9b1b6a642991 (patch) | |
| tree | 5317ae932fad42578cb75518cc1e94d8eb82aeb5 /lib/netdev-notifier-error-inject.c | |
| parent | Merge tag 'docs-5.15-2' of git://git.lwn.net/linux (diff) | |
| parent | Merge branches 'acpi-pm' and 'acpi-docs' (diff) | |
| download | kernel-9c566611ac5cc7b45af943632f7a9b1b6a642991.tar.gz kernel-9c566611ac5cc7b45af943632f7a9b1b6a642991.zip | |
Merge tag 'acpi-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"These add ACPI support to the PCI VMD driver, improve suspend-to-idle
support for AMD platforms and update documentation.
Specifics:
- Add ACPI support to the PCI VMD driver (Rafael Wysocki)
- Rearrange suspend-to-idle support code to reflect the platform
firmware expectations on some AMD platforms (Mario Limonciello)
- Make SSDT overlays documentation follow the code documented by it
more closely (Andy Shevchenko)"
* tag 'acpi-5.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: PM: s2idle: Run both AMD and Microsoft methods if both are supported
Documentation: ACPI: Align the SSDT overlays file with the code
PCI: VMD: ACPI: Make ACPI companion lookup work for VMD bus
Diffstat (limited to 'lib/netdev-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions