Merge branch 'android11-5.4' into android11-5.4-lts

Sync up with android11-5.4 for the following commits:

d0f21836 ANDROID: Revert "tracing/ring-buffer: Have polling block on watermark"
5a8d108c Merge "Merge tag 'android11-5.4.226_r00' into android11-5.4" into android11-5.4
c429b235 UPSTREAM: usb: gadget: f_hid: fix f_hidg lifetime vs cdev
28b985f1 UPSTREAM: usb: gadget: f_hid: optional SETUP/SET_REPORT mode
15a5e4ad ANDROID: add TEST_MAPPING for net/, include/net
f5b4a7be UPSTREAM: nfp: fix use-after-free in area_cache_get()
5a9d3554 UPSTREAM: proc: avoid integer type confusion in get_proc_long
cffda199 UPSTREAM: proc: proc_skip_spaces() shouldn't think it is working on C strings
e418b27c ANDROID: usb: f_accessory: Check buffer size when initialised via composite
98d86001 Merge tag 'android11-5.4.226_r00' into android11-5.4
8912db25 BACKPORT: mm: don't be stuck to rmap lock on reclaim path
a69a8cd3 ANDROID: Add more hvc devices for virtio-console.
7b7c361b UPSTREAM: HID: playstation: support updated DualSense rumble mode.
ff79b92f UPSTREAM: HID: playstation: add initial DualSense Edge controller support
9c127a4a UPSTREAM: HID: playstation: stop DualSense output work on remove.
b32bdd3e UPSTREAM: HID: playstation: convert to use dev_groups
c1ac1f80 UPSTREAM: HID: playstation: fix return from dualsense_player_led_set_brightness()
d4454553 UPSTREAM: HID: playstation: expose DualSense player LEDs through LED class.
07dd46d2 BACKPORT: leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers.
f91c45c1 UPSTREAM: HID: playstation: expose DualSense lightbar through a multi-color LED.
749207d9 UPSTREAM: leds: flash: Fix multicolor no-ops registration by return 0
3e667a08 UPSTREAM: leds: multicolor: Introduce a multicolor class definition
0b5ee17e ANDROID: GKI: enable mulitcolor-led
0ce03d16 BACKPORT: Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled
20fb10aa UPSTREAM: bpf: Ensure correct locking around vulnerable function find_vpid()
0ec48522 UPSTREAM: HID: roccat: Fix use-after-free in roccat_read()
cbbd7242 ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area

Change-Id: I31bed9dd4eb36433c1028ab9073df4839f5a78f6
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>