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

Do a backmerge to catch the android12-5.10-lts branch up with recent
changes done in android12-5.10.  Included in here are the following
commits:

* c761121f Merge tag 'android12-5.10.218_r00' into android12-5.10
* e0ab5345 UPSTREAM: f2fs: avoid false alarm of circular locking
* 758dd4cd UPSTREAM: f2fs: fix deadlock in i_xattr_sem and inode page lock
* 6f61666a ANDROID: userfaultfd: Fix use-after-free in userfaultfd_using_sigbus()
* 441ca240 ANDROID: 16K: Don't set padding vm_flags on 32-bit archs
* 38892968 FROMLIST: binder_alloc: Replace kcalloc with kvcalloc to mitigate OOM issues
* 6d9feaf2 ANDROID: fix kernelci build breaks due to hid/uhid cyclic dependency
* b07354bd Merge tag 'android12-5.10.214_r00' into android12-5.10
* 0a36a75b UPSTREAM: af_unix: Fix garbage collector racing against connect()
* 5fd2d913 ANDROID: uid_sys_stats: Use llist for deferred work
* dbfd6a58 ANDROID: uid_sys_stats: Use a single work for deferred updates
* 98440be3 ANDROID: GKI: Add new ABI symbol list
* 93bad8a4 ANDROID: 16K: Only check basename of linker context
* f91f368b UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
* 732004ab ANDROID: GKI: Update symbols to symbol list
* 9d06d47c ANDROID: ABI fixup for abi break in struct dst_ops
* bff4c6ba BACKPORT: net: fix __dst_negative_advice() race

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