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

Sync up with android12-5.10 for the following commits:

4e90d52c ANDROID: GKI: 7/2/2021 KMI update
6ae626fd ANDROID: ABI: hikey960_gki.fragment: Add cfg80211 and mac80211 as modules
7d8c327a ANDROID: ABI: gki_defconfig: Make cfg80211 and mac80211 modules
ee12781f Revert "ANDROID: GKI: Enable some necessary CFG80211 configs for WIFI"
25c500f2 Revert "ANDROID: dmabuf: Add mmap_count to struct dmabuf"
32f0fa68 Revert "ANDROID: dma-buf: Don't change vm_ops if vm_file changes"
f45304d0 ANDROID: GKI: mmc: add Android ABI padding to some structures
00d9f57a ANDROID: GKI: Add rproc coredump APIs to symbol list
3136de9b ANDROID: GKI: Add remoteproc vendor hook symbols
01999027 ANDROID: rproc: Add vendor hook for recovery
df80ec74 ANDROID: sched: Add vendor data in struct cfs_rq
3ad47a04 ANDROID: Add oem data array for async binder transaction
4b7c0356 UPSTREAM: mm: relocate 'write_protect_seq' in struct mm_struct
f9fcdaea ANDROID: sched: remove regular vendor hooks for 32bit execve
19316b48 ANDROID: GKI: enable CONFIG_BLK_CGROUP_IOCOST
1f23e139 ANDROID: GKI: Add ANDROID_OEM_DATA in struct blk_mq_tags
5b388812 ANDROID: GKI: Add ANDROID_OEM_DATA in struct blk_mq_ctx
3a0675c6 ANDROID: GKI: Add ANDROID_OEM_DATA in struct request_queue
cebb002b ANDROID: ABI: update virtual device symbols for CAN
b971e8ab ANDROID: Add CONFIG_CAN=y to gki_defconfig
d6a486a1 FROMLIST: scsi: ufs: Make HCM parameter configurable
fbf68bf1 FROMLIST: scsi: ufs: Add support for HCM
dd41ce55 FROMLIST: scsi: ufs: Do not send umap_all in host control mode
5e463110 FROMLIST: scsi: ufs: Limit the number of inflight rb
76aa39a9 FROMLIST: scsi: ufs: Add "Cold" regions timer
992cbc0e FROMLIST: scsi: ufs: Add hpb dev reset response
dbf4aa20 FROMLIST: scsi: ufs: Region inactivation in HCM
d5b97844 FROMLIST: scsi: ufs: Eviction in HCM
a782d435 FROMLIST: scsi: ufs: Add region's reads counter
ac898f51 FROMLIST: scsi: ufs: Transform set_dirty to iterate_rgn
a210fd6f FROMLIST: scsi: ufs: Add HCM support to rsp_upiu
bce9649c FROMLIST: scsi: ufs: Cache HPB Control mode on init
756ecd96 FROMLIST: scsi: ufs: Add HPB 2.0 support
7be6123e FROMLIST: scsi: ufs: Prepare HPB read for cached sub-region
466f620a FROMLIST: scsi: ufs: L2P map management for HPB read
791e1c69 FROMLIST: scsi: ufs: Introduce HPB feature
e35b90b7 FROMGIT: block/mq-deadline: Prioritize high-priority requests
855265c7 FROMGIT: block/mq-deadline: Add cgroup support
6981c53a FROMGIT: block/mq-deadline: Track I/O statistics
e3880a66 FROMGIT: block/mq-deadline: Add I/O priority support
63544e14 FROMGIT: block/mq-deadline: Micro-optimize the batching algorithm
179aecb2 FROMGIT: block/mq-deadline: Reserve 25% of scheduler tags for synchronous requests
f3daa8d5 FROMGIT: block/mq-deadline: Improve the sysfs show and store macros
af700306 FROMGIT: block/mq-deadline: Improve compile-time argument checking
d3cebf1c FROMGIT: block/mq-deadline: Rename dd_init_queue() and dd_exit_queue()
4c5a1f31 FROMGIT: block/mq-deadline: Remove two local variables
d0d50fe4 FROMGIT: block/mq-deadline: Add two lockdep_assert_held() statements
dfc5e14a FROMGIT: block/mq-deadline: Add several comments
46d6ae07 FROMGIT: block: Introduce the ioprio rq-qos policy
16b9fe8a FROMGIT: block/blk-rq-qos: Move a function from a header file into a C file
87d38ebe FROMGIT: block/blk-cgroup: Swap the blk_throtl_init() and blk_iolatency_init() calls
3271c926 FROMGIT: block/Kconfig: Make the BLK_WBT and BLK_WBT_MQ entries consecutive
a749efa7 FROMGIT: bfq/mq-deadline: remove redundant check for passthrough request
d7d0098f FROMGIT: blk-mq: Improve performance of non-mq IO schedulers with multiple HW queues
7445a59e FROMGIT: Revert "blk-mq, elevator: Count requests per hctx to improve performance"
72fa98b5 FROMLIST: scsi: ufs: add missing host_lock in setup_xfer_req
e0288fd7 Revert "Revert "FROMGIT: scsi: ufs: Utilize Transfer Request List Completion Notification Register""
9c0d749a Revert "Revert "BACKPORT: FROMGIT: scsi: ufs: Optimize host lock on transfer requests send/compl paths""
3b3bec88 Revert "Revert "KMI: BACKPORT: FROMGIT: scsi: ufs: Optimize host lock on transfer requests send/compl paths""
8d2e1c8a ANDROID: Update the ABI representation
aebdd1ae ANDROID: GKI: Update abi_gki_aarch64_qcom for oom_check_panic symbol
22a57c54 ANDROID: sched: Add trace for __setscheduler_uclamp
5eb3930a ANDROID: usb: export built-in tracepoint functions
7d216e25 ANDROID: Fix lost track action type in save_track_hash
06d75deb ANDROID: ABI: update for new qcom symbols
1eda1085 ANDROID: abi_gki_aarch64_qcom: Update ufs symbol list
a97617cc ANDROID: GKI: Update abi_gki_aarch64_qcom for logbuf_pr_cont tracepoint
872e0b9f ANDROID: Update symbol list for mtk
f32369e8 ANDROID: dma-buf: heaps: export defer-free list size
e0a95560 ANDROID: media: v4l2-core: extend the v4l2 subdev ioctl to support request

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