Skip to content
Snippets Groups Projects
Commit 407c42e0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.4' into android12-5.4-lts


Sync up with android12-5.4 for the following commits:

57b9129d Merge tag 'android12-5.4.225_r00' into android12-5.4
a0eae55f BACKPORT: mm: don't be stuck to rmap lock on reclaim path
4a947285 UPSTREAM: dma-buf: system_heap: Avoid warning on mid-order allocations
a8aad885 ANDROID: GKI: enable mulitcolor-led
4ff53f85 UPSTREAM: HID: playstation: support updated DualSense rumble mode.
1c02a8c3 UPSTREAM: HID: playstation: add initial DualSense Edge controller support
a52bfd94 UPSTREAM: HID: playstation: stop DualSense output work on remove.
25db05bf UPSTREAM: HID: playstation: convert to use dev_groups
470e142b UPSTREAM: HID: playstation: fix return from dualsense_player_led_set_brightness()
f27fab17 UPSTREAM: HID: playstation: expose DualSense player LEDs through LED class.
910258c3 BACKPORT: leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers.
1c2be769 UPSTREAM: HID: playstation: expose DualSense lightbar through a multi-color LED.
733137d4 UPSTREAM: leds: flash: Fix multicolor no-ops registration by return 0
19d26337 UPSTREAM: leds: multicolor: Introduce a multicolor class definition
a76dfbc9 BACKPORT: Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled
d7e5d532 UPSTREAM: bpf: Ensure correct locking around vulnerable function find_vpid()
431ec8c8 UPSTREAM: HID: roccat: Fix use-after-free in roccat_read()
69181d14 ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area

Change-Id: Ic5cc3cd4bac3531ba6a07050e05b3925569fea2b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 73069cc3 57b9129d
No related branches found
No related tags found
No related merge requests found
Showing
with 731 additions and 32 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment