Merge branch 'android12-5.10' into branch 'android12-5.10-lts'

Catch up with some commits applied to the android12-5.10 branch that adds
new symbols to ensure that the ABI remains stable with LTS merges.

This merge contains the following commits:

*   383607d2 Merge "Merge tag 'android12-5.10.185_r00' into android12-5.10" into android12-5.10
|\
| * e4242298 Merge tag 'android12-5.10.185_r00' into android12-5.10
* | b4b7d228 ANDROID: wakeupbypass: Add vendor hook for batteryswap
* | 1dc57723 ANDROID: GKI: Update symbols to symbol list
* | 28f1c8e0 ANDROID: vendor_hook: Add hook to abort reclaim and compaction
* | adad2dab UPSTREAM: Revert "Fix XFRM-I support for nested ESP tunnels"
* | f48a4c3b ANDROID: Incremental fs: Allocate data buffer based on input request size
* | 4def2dd1 ANDROID: ABI: update symbol list for Xclipse GPU
* | bff06d60 ANDROID: vendor_hooks: Supplement the missing hook call point.
* | de4dc1c1 ANDROID: GKI: Add symbol list for Nothing
|/
* b52f2d43 UPSTREAM: usb: dwc3: gadget: Propagate core init errors to UDC during pullup
* 505b4a19 UPSTREAM: usb: gadget: udc: renesas_usb3: Fix use after free bug in renesas_usb3_remove due to race condition
* 158d8bff UPSTREAM: media: rkvdec: fix use after free bug in rkvdec_remove
* 739f5722 UPSTREAM: x86/mm: Avoid using set_pgd() outside of real PGD pages
* 5db82d83 UPSTREAM: relayfs: fix out-of-bounds access in relay_file_read
* be9bc792 UPSTREAM: io_uring: hold uring mutex around poll removal
* 6a975c27 UPSTREAM: net/sched: flower: fix possible OOB write in fl_set_geneve_opt()
* c811ac11 UPSTREAM: ipvlan:Fix out-of-bounds caused by unclear skb->cb
* 540586cf ANDROID: GKI: Update symbols to symbol list
* 4782c8cb ANDROID: vendor_hook: Add hook to tune readaround size
* 69a794a2 ANDROID: vendor_hooks: Add hooks to avoid key threads stalled in memory allocations
* 69dc2c1a UPSTREAM: f2fs: fix to avoid use-after-free for cached IPU bio
* 39c3d169 UPSTREAM: net/sched: cls_u32: Fix reference counter leak leading to overflow
* 4991def0 UPSTREAM: xfs: verify buffer contents when we skip log replay
* 1c98645c UPSTREAM: memstick: r592: Fix UAF bug in r592_remove due to race condition
* e6d71f84 BACKPORT: btrfs: unset reloc control if transaction commit fails in prepare_to_relocate()
* b3af11bf ANDROID: ABI: Update oplus symbol list
* 5f17bf82 ANDROID: Export memcg functions to allow module to add new files
* 40aea038 ANDROID: HID: Only utilise UHID provided exports if UHID is enabled
* 5bffeca4 UPSTREAM: bluetooth: Perform careful capability checks in hci_sock_ioctl()
* c93516a2 ANDROID: HID; Over-ride default maximum buffer size when using UHID
* ab25d94e UPSTREAM: usb: gadget: f_fs: Add unbind event before functionfs_unbind
* 552009b2 UPSTREAM: net: cdc_ncm: Deal with too low values of dwNtbOutMaxSize
* c6ae8be4 ANDROID: GKI: update symbol list for exynos
* 0a52039f UPSTREAM: mailbox: mailbox-test: fix a locking issue in mbox_test_message_write()
* 17bbc533 UPSTREAM: mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
* 708d51e2 UPSTREAM: 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition
* b8290357 FROMGIT: pstore: Revert pmsg_lock back to a normal mutex
* 403d5d13 ANDROID: vendor_hook: Avoid clearing protect-flag before waking waiters
* 2246168a ANDROID: fix a race between speculative page walk and unmap operations
* 7cc458ac BACKPORT: usb: gadget: udc: Handle gadget_connect failure during bind operation
* fffb0ae9 BACKPORT: usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens
* a4420dc2 BACKPORT: f2fs: skip GC if possible when checkpoint disabling

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