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

d0782c94 Merge tag 'android12-5.10.160_r00' into android12-5.10
e12e3609 ANDROID: usb: f_accessory: Check buffer size when initialised via composite
ca53b8f1 BACKPORT: mm: make minimum slab alignment a runtime property
b10e8ec4 BACKPORT: printk: stop including cache.h from printk.h
ce6cc743 UPSTREAM: kasan: fix a missing header include of static_keys.h
3519fc24 BACKPORT: kasan: split kasan_*enabled() functions into a separate header
56583c94 UPSTREAM: usb: gadget: f_fs: Ensure ep0req is dequeued before free_request
b44330f5 UPSTREAM: usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait
d53fb787 UPSTREAM: usb: dwc3: gadget: conditionally remove requests
75a4f0b5 UPSTREAM: usb: dwc3: ep0: Properly handle setup_packet_pending scenario in data stage
767a3608 UPSTREAM: usb: dwc3: gadget: Fix IN endpoint max packet size allocation
7b90f7b0 UPSTREAM: usb: dwc3: gadget: Delay issuing End Transfer
4678fabb UPSTREAM: usb: dwc3: gadget: Only End Transfer for ep0 data phase
a79e848e UPSTREAM: usb: dwc3: ep0: Don't prepare beyond Setup stage
802b4745 UPSTREAM: usb: dwc3: gadget: move cmd_endtransfer to extra function
33b5613a UPSTREAM: usb: dwc3: gadget: ep_queue simplify isoc start condition
d099b9a7 UPSTREAM: usb: dwc3: gadget: Skip reading GEVNTSIZn
15b61c98 UPSTREAM: usb: dwc3: gadget: Ignore Update Transfer cmd params
0761373d UPSTREAM: usb: dwc3: gadget: Skip checking Update Transfer status
7d1d982f UPSTREAM: pstore: Properly assign mem_type property
c83ab50b BACKPORT: ext4: fix use-after-free in ext4_rename_dir_prepare
ab89185d ANDROID: GKI: rockchip: Update symbols
6e50bbff BACKPORT: f2fs: let's avoid panic if extent_tree is not created
39b8fee3 BACKPORT: f2fs: should use a temp extent_info for lookup
937ed4ed BACKPORT: f2fs: don't mix to use union values in extent_info
073b997b BACKPORT: f2fs: initialize extent_cache parameter
aa064914 BACKPORT: f2fs: add block_age-based extent cache
d6ba4dce BACKPORT: f2fs: allocate the extent_cache by default
72e9dd90 BACKPORT: f2fs: refactor extent_cache to support for read and more
561e9feb BACKPORT: f2fs: remove unnecessary __init_extent_tree
bf3cafe7 BACKPORT: f2fs: move internal functions into extent_cache.c
b29b3bd7 BACKPORT: f2fs: specify extent cache for read explicitly
02cb04cb BACKPORT: f2fs: add "c_len" into trace_f2fs_update_extent_tree_range for compressed file
f6b4d18d BACKPORT: f2fs: fix race condition on setting FI_NO_EXTENT flag
3112d6f5 BACKPORT: f2fs: extent cache: support unaligned extent
25280f26 UPSTREAM: io_uring: kill goto error handling in io_sqpoll_wait_sq()
7c31ae52 ANDROID: allmodconfig: disable WERROR
824c5558 UPSTREAM: Enable '-Werror' by default for all kernel builds
447ba7ae ANDROID: GKI: VIVO: Add a symbol to symbol list
91e46755 ANDROID: fips140: add crypto_memneq() back to the module
b460d3c0 ANDROID: GKI: rockchip: Update module fragment and symbol list
91e760f1 ANDROID: GKI: rockchip: Enable symbols for HDMIRX
1960d4cf ANDROID: GKI: rockchip: Enable symbols for Ethernet
529351c4 ANDROID: Re-enable fast mremap and fix UAF with SPF
c67f268c Revert "ANDROID: Make SPF aware of fast mremaps"
13514590 ANDROID: GKI: Update symbols to symbol list
fe60669d ANDROID: fips140: add dump_jitterentropy command to fips140_lab_util
6d015667 UPSTREAM: io_uring: add missing item types for splice request
ad1f2eeb ANDROID: GKI: update xiaomi symbol list
f677efbe Revert "Revert "ANDROID: vendor_hooks:vendor hook for mmput""
a43cd1f2 Revert "Revert "ANDROID: vendor_hooks:vendor hook for __alloc_pages_slowpath.""
9e6fb5ac ANDROID: GKI: rockchip: Add symbol clk_hw_set_parent
7bc2b8c4 UPSTREAM: usb: dwc3: core: Add error log when core soft reset failed
05a8f2c4 FROMLIST: fuse: give wakeup hints to the scheduler
134c1aae ANDROID: Make SPF aware of fast mremaps
16c03440 ANDROID: GKI: enable mulitcolor-led
4aa3cab5 UPSTREAM: HID: playstation: support updated DualSense rumble mode.
63b2567f UPSTREAM: HID: playstation: add initial DualSense Edge controller support
a3ea8fbc UPSTREAM: HID: playstation: stop DualSense output work on remove.
a301358c UPSTREAM: HID: playstation: convert to use dev_groups
62964653 UPSTREAM: HID: playstation: fix return from dualsense_player_led_set_brightness()
f7901b46 UPSTREAM: HID: playstation: expose DualSense player LEDs through LED class.
a70e598c UPSTREAM: leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers.
e1cd3ffe UPSTREAM: HID: playstation: expose DualSense lightbar through a multi-color LED.
65654da0 UPSTREAM: Documentation: leds: standartizing LED names
d37e563b ANDROID: usb: gadget: uvc: remove duplicate code in unbind
8ad88eae ANDROID: dma-buf: Fix build breakage with !CONFIG_DMABUF_SYSFS_STATS
ce18af9b ANDROID: dma-buf: don't re-purpose kobject as work_struct
eddb2f39 UPSTREAM: drm/amdgpu: temporarily disable broken Clang builds due to blown stack-frame
e2a4080d BACKPORT: Kconfig.debug: provide a little extra FRAME_WARN leeway when KASAN is enabled
98671fcc UPSTREAM: bpf: Ensure correct locking around vulnerable function find_vpid()
01b3d953 BACKPORT: UPSTREAM: usb: typec: ucsi: Wait for the USB role switches
37725ca6 UPSTREAM: HID: roccat: Fix use-after-free in roccat_read()
8f0752d0 ANDROID: arm64: mm: perform clean & invalidation in __dma_map_area
d55aeb40 BACKPORT: ANDROID: dma-buf: heaps: replace mutex lock with spinlock
9ef47276 Merge tag 'android12-5.10.149_r00' into android12-5.10
ac30bb60 UPSTREAM: binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0
befa134c UPSTREAM: binder: Address corner cases in deferred copy and fixup
8494d73e UPSTREAM: binder: fix pointer cast warning
3e7e7f4b UPSTREAM: binder: defer copies of pre-patched txn data
58fd89db UPSTREAM: binder: read pre-translated fds from sender buffer
92a864d9 UPSTREAM: binder: avoid potential data leakage when copying txn
d95f5e3d ANDROID: khugepaged: fix mixing declarations warning in retract_page_tables
aaf03dd5 ANDROID: mm: fix build issue in spf when CONFIG_USERFAULTFD=n
1c828eb3 ANDROID: mm: disable speculative page faults for CONFIG_NUMA
1900436d ANDROID: mm: fix invalid backport in speculative page fault path
0f43357d ANDROID: disable page table moves when speculative page faults are enabled
d65d4a05 ANDROID: mm: assert that mmap_lock is taken exclusively in vm_write_begin
bfdcf47c ANDROID: mm: remove sequence counting when mmap_lock is not exclusively owned
5ed391bd ANDROID: mm/khugepaged: add missing vm_write_{begin|end}
59d4d125 BACKPORT: FROMLIST: mm: implement speculative handling in filemap_fault()
2bb39b91 ANDROID: mm: prevent reads of unstable pmd during speculation
4b388752 ANDROID: mm: prevent speculative page fault handling for in do_swap_page()
0560f5f7 ANDROID: mm: prevent speculative page fault handling for userfaults
1169f70f ANDROID: mm: skip pte_alloc during speculative page fault
d84fac97 FROMGIT: mm/madvise: fix madvise_pageout for private file mappings
c7eb32a4 ANDROID: GKI: Update symbols to symbol list
dcdb7ead Revert "FROMGIT: mm/vmalloc: Add override for lazy vunmap"
450a3713 Revert "FROMGIT: arm64: Work around Cortex-A510 erratum 2454944"
01585908 UPSTREAM: efi: capsule-loader: Fix use-after-free in efi_capsule_write
02e13878 FROMGIT: arm64: Work around Cortex-A510 erratum 2454944
abb277d9 FROMGIT: mm/vmalloc: Add override for lazy vunmap
68d4b5fe BACKPORT: mm/page_alloc: always initialize memory map for the holes
a8997cb1 UPSTREAM: usb: dwc3: gadget: Submit endxfer command if delayed during disconnect
910e9e60 UPSTREAM: usb: dwc3: Fix ep0 handling when getting reset while doing control transfer
e0243d19 UPSTREAM: mm/damon/core: initialize damon_target->list in damon_new_target()
82b90410 UPSTREAM: usb: typec: ucsi: Remove incorrect warning
5f1257b5 UPSTREAM: xhci: Don't show warning for reinit on known broken suspend
2df2e2c0 UPSTREAM: mm/damon: validate if the pmd entry is present before accessing
ed91943b UPSTREAM: mm/damon/dbgfs: fix memory leak when using debugfs_lookup()
3093f8b5 UPSTREAM: mm/damon/dbgfs: avoid duplicate context directory creation
3f23bb22 UPSTREAM: crypto: lib - remove unneeded selection of XOR_BLOCKS
bf4603f4 UPSTREAM: pinctrl: sunxi: Fix name for A100 R_PIO
a0630a05 UPSTREAM: cgroup: Add missing cpus_read_lock() to cgroup_attach_task_all()
2a11f678 BACKPORT: usb: gadget: f_uac2: fix superspeed transfer
347d7198 BACKPORT: usb: dwc3: qcom: fix runtime PM wakeup
af723545 UPSTREAM: KVM: arm64: Reject 32bit user PSTATE on asymmetric systems
8407a5ca UPSTREAM: KVM: arm64: Treat PMCR_EL1.LC as RES1 on asymmetric systems
f1bf5340 UPSTREAM: Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression
fdc033d4 UPSTREAM: mm: fix page leak with multiple threads mapping the same page
5b71c43f UPSTREAM: PM: domains: Ensure genpd_debugfs_dir exists before remove
0805a018 UPSTREAM: usb: gadget: uvc: fix changing interface name via configfs
a7ee7101 BACKPORT: dma-mapping: Fix build error unused-value
c3b65245 UPSTREAM: tools/vm/slabinfo: Handle files in debugfs
0b21c99c UPSTREAM: mm/damon: use set_huge_pte_at() to make huge pte old
5084953c UPSTREAM: usb: gadget: f_mass_storage: Make CD-ROM emulation works with Windows OS
7878f983 UPSTREAM: blk-mq: don't touch ->tagset in blk_mq_get_sq_hctx
eb886941 UPSTREAM: PM: domains: Fix initialization of genpd's next_wakeup
4e1bf78a BACKPORT: f2fs: don't use casefolded comparison for "." and ".."
afa5490f UPSTREAM: regulator: scmi: Fix refcount leak in scmi_regulator_probe
521b2c56 UPSTREAM: block/mq-deadline: Set the fifo_time member also if inserting at head
e3b4c69c BACKPORT: Revert "mm/cma.c: remove redundant cma_mutex lock"
1199a5f8 UPSTREAM: module.h: simplify MODULE_IMPORT_NS
18e0efa7 UPSTREAM: iommu/mediatek: Add mutex for m4u_group and m4u_dom in data
adec2c4a UPSTREAM: iommu/mediatek: Remove clk_disable in mtk_iommu_remove
f70c5827 UPSTREAM: iommu/mediatek: Fix 2 HW sharing pgtable issue
ec3e1bdd UPSTREAM: mm: hugetlb: add missing cache flushing in hugetlb_unshare_all_pmds()
b54d7c82 UPSTREAM: selftests/damon: add damon to selftests root Makefile
250f35d7 FROMGIT: f2fs: allow to read node block after shutdown
da05d408 BACKPORT: f2fs: do not submit NEW_ADDR to read node block
34c9208c BACKPORT: ext4,f2fs: fix readahead of verity data
c5589c7e ANDROID: dma-buf: Add vendor hook for deferred dmabuf sysfs stats release
425e7c7e ANDROID: dm-user: Remove bio recount in I/O path
2f29ec11 ANDROID: abi_gki_aarch64_qcom: Add wait_on_page_bit
506e6890 UPSTREAM: drm/meson: Fix overflow implicit truncation warnings
af8a0d5f UPSTREAM: irqchip/tegra: Fix overflow implicit truncation warnings
3d129ea9 UPSTREAM: video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
34055de4 UPSTREAM: irqchip/gic-v4: Wait for GICR_VPENDBASER.Dirty to clear before descheduling
2357d700 UPSTREAM: mm: kfence: fix missing objcg housekeeping for SLAB
329b0783 UPSTREAM: clk: Fix clk_hw_get_clk() when dev is NULL
3c6f1155 UPSTREAM: arm64: kasan: fix include error in MTE functions
9bb85986 UPSTREAM: arm64: prevent instrumentation of bp hardening callbacks
ae9da95d UPSTREAM: PM: domains: Fix sleep-in-atomic bug caused by genpd_debug_remove()
f55885db UPSTREAM: mm: fix use-after-free bug when mm->mmap is reused after being freed
83ed3e2c BACKPORT: vsprintf: Fix %pK with kptr_restrict == 0
712eaeb0 UPSTREAM: net: preserve skb_end_offset() in skb_unclone_keeptruesize()
04557417 BACKPORT: net: add skb_set_end_offset() helper
bbb0dfa3 UPSTREAM: arm64: Correct wrong label in macro __init_el2_gicv3
83185107 UPSTREAM: KVM: arm64: Stop handle_exit() from handling HVC twice when an SError occurs
62e7b5a9 UPSTREAM: KVM: arm64: Avoid consuming a stale esr value when SError occur
a5642af2 BACKPORT: arm64: Enable Cortex-A510 erratum 2051678 by default
c5027380 UPSTREAM: usb: typec: tcpm: Do not disconnect when receiving VSAFE0V
044793f5 UPSTREAM: usb: typec: tcpci: don't touch CC line if it's Vconn source
3630e052 UPSTREAM: dt-bindings: memory: mtk-smi: Correct minItems to 2 for the gals clocks
451971e0 BACKPORT: dt-bindings: memory: mtk-smi: No need mediatek,larb-id for mt8167
f120d141 BACKPORT: dt-bindings: memory: mtk-smi: Rename clock to clocks
64eedcef UPSTREAM: KVM: arm64: Use shadow SPSR_EL1 when injecting exceptions on !VHE
6c2c1020 UPSTREAM: block: fix async_depth sysfs interface for mq-deadline
01a7ade4 UPSTREAM: dma-buf: cma_heap: Fix mutex locking section
8d347619 UPSTREAM: scsi: ufs: ufs-mediatek: Fix error checking in ufs_mtk_init_va09_pwr_ctrl()
b3609875 UPSTREAM: f2fs: include non-compressed blocks in compr_written_block
8599a67e UPSTREAM: kasan: fix Kconfig check of CC_HAS_WORKING_NOSANITIZE_ADDRESS
a9370f7c UPSTREAM: dma-buf: DMABUF_SYSFS_STATS should depend on DMA_SHARED_BUFFER
b85a4aed UPSTREAM: mmflags.h: add missing __GFP_ZEROTAGS and __GFP_SKIP_KASAN_POISON names
3586ade7 BACKPORT: scsi: ufs: Optimize serialization of setup_xfer_req() calls
ab992b1b UPSTREAM: Kbuild: lto: fix module versionings mismatch in GNU make 3.X
fcc95f9a UPSTREAM: clk: versatile: Depend on HAS_IOMEM
7a81ba1e BACKPORT: arm64: meson: select COMMON_CLK
0e74b640 UPSTREAM: kbuild: do not include include/config/auto.conf from adjust_autoksyms.sh
a2afe6cc UPSTREAM: inet: fully convert sk->sk_rx_dst to RCU rules
bbba68ef ANDROID: Update symbol list for mtk
30f7ef65 FROMLIST: binder: fix UAF of alloc->vma in race with munmap()
b1f03eef ANDROID: GKI: Update symbol list for mtk tablet projects
3813ca32 UPSTREAM: af_key: Do not call xfrm_probe_algs in parallel
4e5c3aad UPSTREAM: mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
89fc7740 UPSTREAM: mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
af70ef5b FROMGIT: f2fs: let's avoid to get cp_rwsem twice by f2fs_evict_inode by d_invalidate
356801e2 ANDROID: abi_gki_aarch64_qcom: whitelist some vm symbols

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