Commit b1a6760d 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:

dd139186 ANDROID: usb: gadget: fix NULL pointer dereference in android_setup
07f65598 ANDROID: GKI: Disable kmem cgroup accounting
309aa7e7 FROMLIST: mm, memcg: inline swap-related functions to improve disabled memcg config
3ae8e2f1 BACKPORT: FROMLIST: mm, memcg: inline mem_cgroup_{charge/uncharge} to improve disabled memcg config
f73d0294 FROMLIST: mm, memcg: add mem_cgroup_disabled checks in vmpressure and swap-related functions
669df367 UPSTREAM: mm/memcg: bail early from swap accounting if memcg disabled
1f0c32a6 UPSTREAM: procfs/dmabuf: add inode number to /proc/*/fdinfo
0c8c125f UPSTREAM: procfs: allow reading fdinfo with PTRACE_MODE_READ
2e0476a4 Revert "FROMLIST: procfs: Allow reading fdinfo with PTRACE_MODE_READ"
5ded961a Revert "FROMLIST: BACKPORT: procfs/dmabuf: Add inode number to /..."
3ee55650 UPSTREAM: f2fs: initialize page->private when using for our internal use
dba79c3a ANDROID: mm: page_pinner: report test_page_isolation_failure
13362ab2 ANDROID: mm: page_pinner: add state of page_pinner
32549484 ANDROID: mm: page_pinner: add more struct page fields
0445b67b ANDROID: mm: page_pinner: change timestamp format
71da0672 ANDROID: mm: page_pinner: print_page_pinner refactoring
b83e5649 ANDROID: mm: page_pinner: remove shared_count
849f0480 ANDROID: mm: page_pinner: remove WARN_ON_ONCE
9a453100 ANDROID: mm: page_pinner: fix typos
d012783a ANDROID: mm: page_pinner: reset migration failed page
470cce50 ANDROID: mm: page_pinner: record every put_page
9f47e5fd ANDROID: mm: page_pinner: change function names
a8385d61 ANDROID: Allow vendor module to reclaim a memcg
f41a95ea ANDROID: Export memcg functions to allow module to add new files
46bf3b94 FROMGIT: dt-bindings: usb: dwc3: Update dwc3 TX fifo properties
b36b813e UPSTREAM: dt-bindings: usb: Convert DWC USB3 bindings to DT schema
9a80b7b7 FROMGIT: of: Add stub for of_add_property()
2742be59 ANDROID: fips140: define fips_enabled to 1 to enable FIPS behavior
e886dd4c ANDROID: fips140: unregister existing DRBG algorithms
634445a6 ANDROID: fips140: fix deadlock in unregister_existing_fips140_algos()
0af06624 ANDROID: fips140: check for errors from initcalls
92de5347 ANDROID: fips140: log already-live algorithms
0a7da215 ANDROID: Update new mtk gki symbol
98085b5d ANDROID: usb: Add vendor hook for usb suspend and resume
956db89e BACKPORT: FROMLIST: dma-heap: Let dma heap use dma_map_attrs to map & unmap iova
749d6e7f ANDROID: abi_gki_aarch64_qcom: Add vendor hook for shmem_alloc_page
b05bbe48 ANDROID: abi_gki_aarch64_qcom: Add reclaim_shmem_address_space
d80c70d7 ANDROID: android: export kernel function arch_mmap_rnd
25c7eb49 ANDROID: mm: shmem: Fix build break with allnoconfig
1cdcf76b ANDROID: vendor_hooks: add hooks in mem_cgroup subsystem
726468dd ANDROID: GKI: add vendor padding variable in struct skb_shared_info
fc79c936 FROMLIST: scsi: ufs: add quirk to enable host controller without interface configuration
2d5ae6b7 FROMLIST: scsi: ufs: add quirk to handle broken UIC command
38abaeba ANDROID: syscall_check: add vendor hook for bpf syscall
a7a3b31d ANDROID: syscall_check: add vendor hook for open syscall
a5543c9c ANDROID: syscall_check: add vendor hook for mmap syscall
1f076927 ANDROID: GKI: Add symbol to symbol list
2cff74e0 ANDROID: vendor_hooks: Add vendor hook to the net
25edba0d FROMLIST: scsi: ufs: Fix the SCSI abort handler
c0efdc4a ANDROID: android: export kernel function vm_unmapped_area
964220d0 ANDROID: shmem: vendor hook in shmem_alloc_page
bd2ca0ba FROMLIST: pstore/ram: Rework logic for detecting ramoops reserved memory region
daeabfe7 ANDROID: mm: add reclaim_shmem_address_space() for faster reclaims
4c3dddf4 ANDROID: Update the generic ABI symbol list
4c4d8cbd ANDROID: GKI: refresh ABI XML
01e4a037 ANDROID: GKI: turn on TIDY_ABI
edf973fd ANDROID: Update symbol list for VIVO
1702d2c8 FROMGIT: net: cdc_ncm: switch to eth%d interface naming
f4d6e832 ANDROID: GKI: add allowed GKI symbol for Exynosauto SoC
444a0b77 ANDROID: mm: add vendor hook for vmpressure
c799c664 ANDROID: fips140: adjust some log messages
091338cb ANDROID: fips140: add missing static keyword to fips140_init()
70bfd6a7 ANDROID: GKI: update allowed list for exynosauto SoC
3e3147b2 UPSTREAM: scsi: ufs: ufshcd: Fix some function doc-rot
2c553e75 UPSTREAM: scsi: ufs: Adjust ufshcd_hold() during sending attribute requests
52ccdf90 FROMLIST: lockdep: Remove console_verbose when disable lock debugging
44584944 ANDROID: ABI: qcom: Add symbols for 80211
5c51579f ANDROID: fork: Export task_newtask tracepoint
e2a90797 ANDROID: Fix kernelci warnings for indentation in smp.c
bac33eae ANDROID: irqchip: gic-v3: Move struct gic_chip_data to header
bdac4418 ANDROID: abi_gki_aarch64_qcom: Add android_vh_ufs_clock_scaling
65c1de0f ANDROID: Update symbol list for mtk
d4d02ab9 UPSTREAM: swiotlb: manipulate orig_addr when tlb_addr has offset
58aa0f28 ANDROID: qcom: Add net related symbol
2f9f8164 ANDROID: Update the exynos symbol list
b2a94712 ANDROID: Update symbol list for mtk
7c9599e2 FROMGIT: usb: dwc3: Create helper function getting MDWIDTH
0a24affb ANDROID: vendor_hooks: modify the function name
d686d5ff ANDROID: GKI: Add some symbols to symbol list
bdfb1123 ANDROID: cpuidle: Allow for an early exit from cpuidle_enter_state()
f0b280c3 ANDROID: cpuidle: Update cpuidle_uninstall_idle_handler() to wakeup all online CPUs
14dd90ab ANDROID: scsi: ufs: Add hook to influence the UFS clock scaling policy
00aec39e FROMGIT: bpf: Support all gso types in bpf_skb_change_proto()

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