Merge branch 'android12-5.10' into `android12-5.10-lts`
Sync up with android12-5.10 for the following commits: 1419b694 Merge tag 'android12-5.10.101_r00' into android12-5.10 3eec4418 UPSTREAM: usb: gadget: Fix use-after-free bug by not setting udc->dev.driver 821f3e53 UPSTREAM: usb: gadget: rndis: prevent integer overflow in rndis_set_response() 39aca159 FROMGIT: mm/migrate: fix race between lock page and clear PG_Isolated de033421 UPSTREAM: arm64: proton-pack: Include unprivileged eBPF status in Spectre v2 mitigation reporting d236f7b4 UPSTREAM: arm64: Use the clearbhb instruction in mitigations 98b16e80 UPSTREAM: KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated 0f76dfc5 UPSTREAM: arm64: Mitigate spectre style branch history side channels 5411474f UPSTREAM: arm64: Do not include __READ_ONCE() block in assembly files e9a39a64 UPSTREAM: KVM: arm64: Allow indirect vectors to be used without SPECTRE_V3A fee1ae7c UPSTREAM: arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2 d95b0b4e UPSTREAM: arm64: Add percpu vectors for EL1 30180ef4 Revert "BACKPORT: FROMLIST: scsi: core: Reserve one tag for the UFS driver" 28837e41 UPSTREAM: arm64: entry: Add macro for reading symbol addresses from the trampoline e322fe26 UPSTREAM: arm64: entry: Add vectors that have the bhb mitigation sequences 2a90cf9a UPSTREAM: arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations 0db372ec UPSTREAM: arm64: entry: Allow the trampoline text to occupy multiple pages 158c87e5 UPSTREAM: arm64: entry: Make the kpti trampoline's kpti sequence optional e6408b96 UPSTREAM: arm64: entry: Move trampoline macros out of ifdef'd section 00d8bb6b UPSTREAM: arm64: entry: Don't assume tramp_vectors is the start of the vectors 0defb52c UPSTREAM: arm64: entry: Allow tramp_alias to access symbols after the 4K boundary 6e48449c UPSTREAM: arm64: entry: Move the trampoline data page before the text page bb8baaf3 UPSTREAM: arm64: entry: Free up another register on kpti's tramp_exit path 32ba6d5d UPSTREAM: arm64: entry: Make the trampoline cleanup optional c8b567d8 UPSTREAM: arm64: spectre: Rename spectre_v4_patch_fw_mitigation_conduit 17867c11 UPSTREAM: arm64: entry.S: Add ventry overflow sanity checks 81ec26aa UPSTREAM: arm64: cpufeature: add HWCAP for FEAT_RPRES 18c4e4fa UPSTREAM: arm64: cpufeature: add HWCAP for FEAT_AFP 68bc555a UPSTREAM: arm64: add ID_AA64ISAR2_EL1 sys register 2e2eef40 UPSTREAM: arm64: Add HWCAP for self-synchronising virtual counter 6d1f2678 UPSTREAM: arm64: Add Cortex-X2 CPU part definition 51eded5d UPSTREAM: arm64: cputype: Add CPU implementor & types for the Apple M1 cores 803ff116 UPSTREAM: binder: Add invalid handle info in user error log a40cd237 UPSTREAM: ARM: fix Thumb2 regression with Spectre BHB 56186c7e UPSTREAM: ARM: Spectre-BHB: provide empty stub for non-config 1ea0d915 UPSTREAM: ARM: fix build warning in proc-v7-bugs.c fdf3cb8a UPSTREAM: ARM: Do not use NOCROSSREFS directive with ld.lld 57bc1e13 UPSTREAM: ARM: fix co-processor register typo a4e68d43 UPSTREAM: ARM: fix build error when BPF_SYSCALL is disabled bd237683 UPSTREAM: ARM: include unprivileged BPF status in Spectre V2 reporting afbbe404 UPSTREAM: ARM: Spectre-BHB workaround 5a41f364 UPSTREAM: ARM: use LOADADDR() to get load address of sections 3bfcb356 UPSTREAM: ARM: early traps initialisation 5a64a668 UPSTREAM: ARM: report Spectre v2 status through sysfs 9362cd2b UPSTREAM: x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT 54a2bd02 UPSTREAM: x86/speculation: Warn about Spectre v2 LFENCE mitigation f1b1f893 UPSTREAM: x86/speculation: Update link to AMD speculation whitepaper c4188388 UPSTREAM: x86/speculation: Use generic retpoline by default on AMD bd02dc43 UPSTREAM: x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting 38835037 UPSTREAM: Documentation/hw-vuln: Update spectre doc 1c3e9858 UPSTREAM: x86/speculation: Add eIBRS + Retpoline options cc9e9aa4 UPSTREAM: x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE 414a6076 UPSTREAM: x86,bugs: Unconditionally allow spectre_v2=retpoline,amd f27f62fe UPSTREAM: bpf: Add kconfig knob for disabling unpriv bpf by default f3ca80cc ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree 4ebb639f ANDROID: mm: page_pinner: fix build warning fe75d583 ANDROID: fault: Add vendor hook for TLB conflict 8248a3e7 BACKPORT: sched: Fix yet more sched_fork() races cd6e5d5d ANDROID: mm/slub: Fix Kasan issue with for_each_object_track 8dbcaf63 ANDROID: dm kcopyd: Use reserved memory for the copy buffer 7b5fea2f ANDROID: GKI: add allowed list file for xiaomi ae38f995 ANDROID: GKI: Update symbols to symbol list 786bcb11 FROMGIT: f2fs: quota: fix loop condition at f2fs_quota_sync() 91fef75d FROMGIT: f2fs: Restore rwsem lockdep support 4cc8ec84 ANDROID: ABI: update allowed list for galaxy fcaaaaae UPSTREAM: mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work 91be4236 ANDROID: GKI: remove vfs-only namespace from 2 symbols a817d6ed ANDROID: mm: Fix page table lookup in speculative fault path e53b1b9a UPSTREAM: xhci: re-initialize the HC during resume if HCE was set 767f3841 FROMGIT: xhci: make xhci_handshake timeout for xhci_reset() adjustable ebbf267f ANDROID: vendor_hooks: Add hooks for __alloc_pages_direct_reclaim 135406ce ANDROID: dma-direct: Document disable_dma32 bf96382f ANDROID: dma-direct: Make DMA32 disablement work for CONFIG_NUMA 8f66dc1a UPSTREAM: mmc: block: fix read single on recovery logic cf221db7 UPSTREAM: fget: check that the fd still exists after getting a ref to it 43754d8b ANDROID: GKI: Update symbols to symbol list f2d0c305 ANDROID: vendor_hooks: Add hooks for shrink_active_list 62412e5b FROMGIT: mm: count time in drain_all_pages during direct reclaim as memory pressure 3b9fe10e ANDROID: incremental-fs: remove spurious kfree() acefa91e ANDROID: vendor_hooks: Add hooks for binder c3ac7418 ANDROID: qcom: Add sysfs related symbol Change-Id: Icbe5fb26e3cef602e3bbc01745a755a95d72a1a0
Loading