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:Greg Kroah-Hartman <gregkh@google.com>
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-class-led-multicolor 35 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-led-multicolor
- Documentation/leds/index.rst 1 addition, 0 deletionsDocumentation/leds/index.rst
- Documentation/leds/leds-class-multicolor.rst 86 additions, 0 deletionsDocumentation/leds/leds-class-multicolor.rst
- arch/arm64/configs/gki_defconfig 1 addition, 0 deletionsarch/arm64/configs/gki_defconfig
- arch/arm64/mm/cache.S 2 additions, 0 deletionsarch/arm64/mm/cache.S
- arch/x86/configs/gki_defconfig 1 addition, 0 deletionsarch/x86/configs/gki_defconfig
- drivers/dma-buf/heaps/system_heap.c 3 additions, 2 deletionsdrivers/dma-buf/heaps/system_heap.c
- drivers/hid/hid-ids.h 1 addition, 0 deletionsdrivers/hid/hid-ids.h
- drivers/hid/hid-playstation.c 238 additions, 18 deletionsdrivers/hid/hid-playstation.c
- drivers/leds/Kconfig 10 additions, 0 deletionsdrivers/leds/Kconfig
- drivers/leds/Makefile 1 addition, 0 deletionsdrivers/leds/Makefile
- drivers/leds/led-class-multicolor.c 203 additions, 0 deletionsdrivers/leds/led-class-multicolor.c
- include/dt-bindings/leds/common.h 5 additions, 0 deletionsinclude/dt-bindings/leds/common.h
- include/linux/fs.h 5 additions, 0 deletionsinclude/linux/fs.h
- include/linux/led-class-multicolor.h 109 additions, 0 deletionsinclude/linux/led-class-multicolor.h
- include/linux/rmap.h 18 additions, 6 deletionsinclude/linux/rmap.h
- mm/huge_memory.c 1 addition, 1 deletionmm/huge_memory.c
- mm/ksm.c 7 additions, 1 deletionmm/ksm.c
- mm/memory-failure.c 1 addition, 1 deletionmm/memory-failure.c
- mm/page_idle.c 3 additions, 3 deletionsmm/page_idle.c
Loading
Please register or sign in to comment