Commit 55bef3bc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This catches the -lts branch up with recent changes in the non-lts
branch.  Changes included in here are:

* c1f6eb35 Merge tag 'android12-5.10.233_r00' into android12-5.10
* 384bf306 UPSTREAM: coresight: etm4x: Do not hardcode IOMEM access for register restore
* 0542a84d UPSTREAM: coresight: etm4x: Fix unbalanced pm_runtime_enable()
* 30540d85 UPSTREAM: ubsan: fix unused variable warning in test module
* 96b23148 BACKPORT: powercap: dtpm_cpu: Fix error check against freq_qos_add_request()
* 280f4071 UPSTREAM: usb: gadget: ncm: Fix indentations in documentation of NCM section
* c45f62b1 BACKPORT: scs: add CONFIG_MMU dependency for vfree_atomic()
* beab58a2 UPSTREAM: mm/damon/vaddr: change asm-generic/mman-common.h to linux/mman.h
* 73d985d1 UPSTREAM: ASoC: hdmi-codec: fix missing report for jack initial status
* 1aa6d763 UPSTREAM: usb: gadget: uvc: fix dropped frame after missed isoc
* 4c22b859 BACKPORT: exfat: fix overflow for large capacity partition
* dea08dbb FROMGIT: f2fs: Introduce linear search for dentries
* 3cefb2e8 ANDROID: GKI: Add additional symbols for honor
* 7dd3d30d ANDROID: GKI: Update symbol list for honor
* 9329c5e9 ANDROID: ABI: update symbol list for honor
* 0f08e149 ANDROID: arm64: add vendor hooks for bad_stack.
* 8b2495a8 UPSTREAM: selinux: ignore unknown extended permissions
* 1d50fa14 ANDROID: GKI: Update symbol list for honor
* 964c7bd0 ANDROID: Allow vendor modules perform more operationson on sock.
* 21d5db41 ANDROID: ABI: update symbol list for honor
* 577ed006 ANDROID: mm: add vendor hook in fault and read file
* 84b45753 BACKPORT: block, bfq: fix UAF problem in bfqg_stats_init()
* c6c375c9 UPSTREAM: Revert "usb: gadget: composite: fix OS descriptors w_value logic"
* 5b4ca3d3 ANDROID: GKI: Update the ABI symbol list
* c306f51a UPSTREAM: bpf: sync_linked_regs() must preserve subreg_def
* 0b7d5831 UPSTREAM: ALSA: usb-audio: Fix a DMA to stack memory bug
* de8162b3 ANDROID: ABI: update symbol list for galaxy
* 5072dc52 UPSTREAM: ALSA: usb-audio: Fix out of bounds reads when finding clock sources
* 26acf0ab UPSTREAM: ALSA: usb-audio: Fix potential out-of-bound accesses for Extigy and Mbox devices

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