Commit 1328352d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Sync up with android12-5.10 for the following commits:

870488eb ANDROID: GKI: 7/14/2021 KMI update
e9742a9e ANDROID: Update the ABI symbol list
ec2190fd FROMLIST: arm64: avoid double ISB on kernel entry
98b2c1dd FROMLIST: arm64: mte: optimize GCR_EL1 modification on kernel entry/exit
a20103c3 BACKPORT: FROMLIST: arm64: mte: avoid TFSR related operations unless in async mode
3972be64 FROMLIST: Documentation: document the preferred tag checking mode feature
5adf29ad FROMLIST: arm64: mte: introduce a per-CPU tag checking mode preference
ce5ba15a FROMLIST: arm64: move preemption disablement to prctl handlers
6c08feaa FROMLIST: arm64: mte: change ASYNC and SYNC TCF settings into bitfields
f438cf16 FROMLIST: arm64: mte: rename gcr_user_excl to mte_ctrl
a4c9e551 BACKPORT: arm64: pac: Optimize kernel entry/exit key installation code paths
50829b89 BACKPORT: arm64: Introduce prctl(PR_PAC_{SET,GET}_ENABLED_KEYS)
6119d18d ANDROID: cleancache: add oem data to cleancache_ops
a0c429e8 ANDROID: blkdev: add oem data to block_device_operations
26cd2564 FROMLIST: psi: stop relying on timer_pending for poll_work rescheduling
e85b291d ANDROID: GKI: Enable CONFIG_MEMCG
0ed7424f ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle
4d309564 ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle
7786463e ANDROID: GKI: add vendor padding variable in struct sock
280c9b98 ANDROID: GKI: add vendor padding variable in struct nf_conn
9d1b55d2 ANDROID: vendor_hooks: add a field in mem_cgroup
65115fdb ANDROID: vendor_hooks: add a field in pglist_data
26920e0f FROMLIST: usb: dwc3: avoid NULL access of usb_gadget_driver
5bb2dd8d FROMGIT: usb: dwc3: dwc3-qcom: Enable tx-fifo-resize property by default
79274dbb FROMGIT: usb: dwc3: Resize TX FIFOs to meet EP bursting requirements
1e11f361 FROMGIT: usb: gadget: configfs: Check USB configuration before adding
6da5e7af FROMGIT: usb: gadget: udc: core: Introduce check_config to verify USB configuration
2ed5fbf2 ANDROID: GKI: fscrypt: add OEM data to struct fscrypt_operations
194fd923 ANDROID: GKI: fscrypt: add ABI padding to struct fscrypt_operations
8011eb22 ANDROID: mm: provision to add shmem pages to inactive file lru head
9bb12476 ANDROID: GKI: Enable CONFIG_CGROUP_NET_PRIO
a1ce719c ANDROID: Delete the DMA-BUF attachment sysfs statistics
a2b3afb2 ANDROID: android: Add symbols to debug_symbols driver
914a7b14 UPSTREAM: USB: UDC core: Add udc_async_callbacks gadget op
9af9ef8d ANDROID: vendor_hooks: Add oem data to file struct
37485a30 ANDROID: add kabi padding for structures for the android12 release
429c78f9 ANDROID: GKI: device.h: add Android ABI padding to some structures
aea5e1c2 ANDROID: GKI: elevator: add Android ABI padding to some structures
1b79ef27 ANDROID: GKI: scsi: add Android ABI padding to some structures
33175403 ANDROID: GKI: workqueue.h: add Android ABI padding to some structures
d5c344a4 ANDROID: GKI: sched: add Android ABI padding to some structures
9c4854fa ANDROID: GKI: phy: add Android ABI padding to some structures
f4872b23 ANDROID: GKI: fs.h: add Android ABI padding to some structures
48cddc7c ANDROID: GKI: dentry: add Android ABI padding to some structures
b9081a29 ANDROID: GKI: bio: add Android ABI padding to some structures
99bf8cf8 ANDROID: GKI: ufs: add Android ABI padding to some structures
9df14729 ANDROID: Update the generic symbol list
12f48605 ANDROID: mm: cma do not sleep for __GFP_NORETRY
0e688e97 ANDROID: mm: cma: skip problematic pageblock
9938b82b ANDROID: mm: bail out tlb free batching on page zapping when cma is going on
c8578a3e ANDROID: mm: lru_cache_disable skips lru cache drainnig
c01ce3b5 ANDROID: mm: do not try test_page_isoalte if migration fails
675e5045 ANDROID: mm: add cma allocation statistics
b1e4543c UPSTREAM: mm, page_alloc: move draining pcplists to page isolation users
13bc06ef ANDROID: ALSA: compress: add vendor hook to support pause in draining
2faed777 ANDROID: vendor_hooks: add vendor hook in blk_mq_rq_ctx_init()
292baba4 ANDROID: abi_gki_aarch64_qcom: Add I3C core symbols to qcom tree
eecc725a ANDROID: vendor_hooks: add vendor hook in blk_mq_alloc_rqs()
9c2958f4 ANDROID: GKI: Export put_task_stack symbol
288805c8 ANDROID: abi_gki_aarch64_qcom: Add idr_alloc_u32
e8516fd3 ANDROID: sound: usb: add vendor hook for cpu suspend support
d820d22b ANDROID: mm: page_pinner: use EXPORT_SYMBOL_GPL
efc09793 ANDROID: GKI: update allowed GKI symbol for Exynosauto SoC
67e3e39e ANDROID: GKI: sync allowed list for exynosauto SoC
d25e2563 ANDROID: ABI: add new symbols required by fips140.ko
50661975 ANDROID: fips140: add/update module help text
b7397e89 ANDROID: fips140: add power-up cryptographic self-tests
bd7d13c3 ANDROID: arm64: disable LSE when building the FIPS140 module
1061ef04 ANDROID: jump_label: disable jump labels in fips140.ko
dcf509fe ANDROID: ipv6: add vendor hook for gen ipv6 link-local addr
018332e8 ANDROID: Revert "scsi: block: Do not accept any requests while suspended"
2ad2c3a2 ANDROID: abi_gki_aarch64_qcom: whitelist vm_event_states
7bcfde26 ANDROID: ashmem: Export is_ashmem_file

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I7d60121fa9f25f007dab97dd666adcdb1964afc8
parents a3cd27f5 870488eb
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment