Commit 7a206806 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android12-5.4' into 'android12-5.4-lts'



Sync up with android12-5.4 for the following commits:

59757c28ad36 Merge branch 'android12-5.4' into b12-lts
b6af6da9 Merge tag 'android12-5.4.180_r00' into android12-5.4
0aab3394 ANDROID: ABI: Update symbols to unisoc whitelist for the 26st
f6704d64 UPSTREAM: usb: gadget: Fix use-after-free bug by not setting udc->dev.driver
cbf9e22f UPSTREAM: usb: gadget: rndis: prevent integer overflow in rndis_set_response()
0b5a96ee UPSTREAM: fixup for "arm64 entry: Add macro for reading symbol address from the trampoline"
49216514 UPSTREAM: arm64: Use the clearbhb instruction in mitigations
e86a4544 UPSTREAM: KVM: arm64: Allow SMCCC_ARCH_WORKAROUND_3 to be discovered and migrated
0355fa06 UPSTREAM: arm64: Mitigate spectre style branch history side channels
7b04104e UPSTREAM: KVM: arm64: Add templates for BHB mitigation sequences
f9a3c7a4 UPSTREAM: arm64: proton-pack: Report Spectre-BHB vulnerabilities as part of Spectre-v2
645c7785 UPSTREAM: arm64: Add percpu vectors for EL1
278a94dd UPSTREAM: arm64: entry: Add macro for reading symbol addresses from the trampoline
377b105c UPSTREAM: arm64: entry: Add vectors that have the bhb mitigation sequences
b209e4cf UPSTREAM: arm64: entry: Add non-kpti __bp_harden_el1_vectors for mitigations
872d7ed0 UPSTREAM: arm64: entry: Allow the trampoline text to occupy multiple pages
0f6a0e38 UPSTREAM: arm64: entry: Make the kpti trampoline's kpti sequence optional
500c5f39 UPSTREAM: arm64: entry: Move trampoline macros out of ifdef'd section
3e108e0d UPSTREAM: arm64: entry: Don't assume tramp_vectors is the start of the vectors
c634cefd UPSTREAM: arm64: entry: Allow tramp_alias to access symbols after the 4K boundary
c3f2a3d9 UPSTREAM: arm64: entry: Move the trampoline data page before the text page
5dab75b5 UPSTREAM: arm64: entry: Free up another register on kpti's tramp_exit path
946205af UPSTREAM: arm64: entry: Make the trampoline cleanup optional
5716a7eb UPSTREAM: arm64: entry.S: Add ventry overflow sanity checks
06959dde UPSTREAM: arm64: Add Cortex-X2 CPU part definition
017ef97c UPSTREAM: arm64: add ID_AA64ISAR2_EL1 sys register
74a8864b UPSTREAM: arm64: Add Neoverse-N2, Cortex-A710 CPU part definition
09f09df2 UPSTREAM: arm64: Add part number for Arm Cortex-A77
29415e37 UPSTREAM: sctp: fix the processing for INIT chunk
ffcfa2b7 ANDROID: ABI: Update symbols to unisoc whitelist for the 25th
2b9be633 ANDROID: dm-bow: Protect Ranges fetched and erased from the RB tree
be3489a5 UPSTREAM: ARM: fix Thumb2 regression with Spectre BHB
b8bbe4d5 UPSTREAM: ARM: Spectre-BHB: provide empty stub for non-config
5a7d8e9f UPSTREAM: ARM: fix build warning in proc-v7-bugs.c
37da6fd4 UPSTREAM: ARM: Do not use NOCROSSREFS directive with ld.lld
19618ee3 UPSTREAM: ARM: fix co-processor register typo
7443e9a5 UPSTREAM: ARM: fix build error when BPF_SYSCALL is disabled
3bd4909d UPSTREAM: ARM: include unprivileged BPF status in Spectre V2 reporting
3559302b UPSTREAM: ARM: Spectre-BHB workaround
e953d402 UPSTREAM: ARM: use LOADADDR() to get load address of sections
06e3c6f9 UPSTREAM: ARM: early traps initialisation
2c8e1c2e UPSTREAM: ARM: report Spectre v2 status through sysfs
9393de4e UPSTREAM: arm/arm64: smccc/psci: add arm_smccc_1_1_get_conduit()
5dadeec8 UPSTREAM: arm/arm64: Provide a wrapper for SMCCC 1.1 calls
13295230 UPSTREAM: x86/speculation: Warn about eIBRS + LFENCE + Unprivileged eBPF + SMT
4f4f96f8 UPSTREAM: x86/speculation: Warn about Spectre v2 LFENCE mitigation
e0f734c7 UPSTREAM: x86/speculation: Update link to AMD speculation whitepaper
303f0552 UPSTREAM: x86/speculation: Use generic retpoline by default on AMD
0d038ea6 UPSTREAM: x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting
c1552f20 UPSTREAM: Documentation/hw-vuln: Update spectre doc
aa675386 UPSTREAM: x86/speculation: Add eIBRS + Retpoline options
e88883e8 UPSTREAM: x86/speculation: Rename RETPOLINE_AMD to RETPOLINE_LFENCE
80b8ba22 UPSTREAM: x86,bugs: Unconditionally allow spectre_v2=retpoline,amd
bdbccce5 UPSTREAM: x86/speculation: Merge one test in spectre_v2_user_select_mitigation()
865ec252 UPSTREAM: bpf: Add kconfig knob for disabling unpriv bpf by default
db2bb2db ANDROID: incremental-fs: Add free options in incfs_mount
6571114d Revert "ANDROID: incremental-fs: remove index and incomplete dir on umount"
2d289210 UPSTREAM: mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work
8a3679a7 UPSTREAM: mmc: block: fix read single on recovery logic
961dd91c Revert "ANDROID: incremental-fs: fix mount_fs issue"
7479ec62 UPSTREAM: lib/iov_iter: initialize "flags" in new pipe_buffer
cae20698 UPSTREAM: scsi: ufs: Fix clkgating on/off
ed8bc003 UPSTREAM: driver: core: Fix list corruption after device_del()
0d36c5d6 UPSTREAM: ARM: config: aspeed: Add DEBUG_FS and EXT4
36a9271c UPSTREAM: mark pstore-blk as broken
00d9c7d2 UPSTREAM: blk-crypto: fix check for too-large dun_bytes
c79b9571 UPSTREAM: usb: musb: select GENERIC_PHY instead of depending on it
4a84ba58 UPSTREAM: mm/userfaultfd: selftests: fix memory corruption with thp enabled
07c4e15b UPSTREAM: exit: Remove calls of do_exit after noreturn versions of die
c0a6ed91 UPSTREAM: signal/sparc32: Remove unreachable do_exit in do_sparc_fault
cdbd6736 UPSTREAM: mm/mremap: don't account pages in vma_to_resize()
a3537832 UPSTREAM: wireguard: allowedips: add missing __rcu annotation to satisfy sparse
a873b05e UPSTREAM: dma-buf: system_heap: Use 'for_each_sgtable_sg' in pages free flow
5cb9ff10 UPSTREAM: virtio/vsock: fix the transport to work with VMADDR_CID_ANY
34b3448c UPSTREAM: HID: holtek: fix mouse probing
29002d26 UPSTREAM: f2fs: fix UAF in f2fs_available_free_memory
defac899 ANDROID: ABI: Update symbols to unisoc whitelist for the 24th
24267954 UPSTREAM: usb: gadget: rndis: check size of RNDIS_MSG_SET command
3161857d UPSTREAM: USB: gadget: validate interface OS descriptor requests
47899a06 UPSTREAM: f2fs: change fiemap way in printing compression chunk
84a24b5e FROMGIT: f2fs: avoid EINVAL by SBI_NEED_FSCK when pinning a file
760fcddc UPSTREAM: tipc: improve size validations for received domain records
d2392cf8 Revert "tracefs: Have tracefs directories not set OTH permission bits by default"

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