diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-30 15:56:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-30 15:56:24 -0700 |
commit | e1dab4c02de0b495a9393915d71e452f8e77a464 (patch) | |
tree | adf597daffe391c7403c0aff27f726efa9419082 /net/netfilter/ipset/ip_set_hash_netportnet.c | |
parent | 3a34b13a88caeb2800ab44a4918f230041b37dd9 (diff) | |
parent | e83f54eacf137de228a52c20c74e77f575684600 (diff) | |
download | linux-e1dab4c02de0b495a9393915d71e452f8e77a464.tar.bz2 |
Merge tag 'acpi-5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"These revert a recent IRQ resources handling modification that turned
out to be problematic, fix suspend-to-idle handling on AMD platforms
to take upcoming systems into account properly and fix the retrieval
of the DPTF attributes of the PCH FIVR.
Specifics:
- Revert recent change of the ACPI IRQ resources handling that
attempted to improve the ACPI IRQ override selection logic, but
introduced serious regressions on some systems (Hui Wang).
- Fix up quirks for AMD platforms in the suspend-to-idle support code
so as to take upcoming systems using uPEP HID AMDI007 into account
as appropriate (Mario Limonciello).
- Fix the code retrieving DPTF attributes of the PCH FIVR so that it
agrees on the return data type with the ACPI control method
evaluated for this purpose (Srinivas Pandruvada)"
* tag 'acpi-5.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: DPTF: Fix reading of attributes
Revert "ACPI: resources: Add checks for ACPI IRQ override"
ACPI: PM: Add support for upcoming AMD uPEP HID AMDI007
Diffstat (limited to 'net/netfilter/ipset/ip_set_hash_netportnet.c')
0 files changed, 0 insertions, 0 deletions