Commit 22b064ea authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android13-5.10' into branch 'android13-5.10-lts'



Sync up the android13-5.10-lts branch up with recent changes and merges
in the android13-5.10 branch.  Changes in here include the following:

* 0136a878 Merge tag 'android13-5.10.210_r00' into branch android13-5.10
* 32e6a7b3 UPSTREAM: selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
* be558052 UPSTREAM: powercap: dtpm_cpu: Fix error check against freq_qos_add_request()
* 5654ee1e UPSTREAM: usb: core: Prevent null pointer dereference in update_port_device_state
* 56dc58f6 UPSTREAM: scs: add CONFIG_MMU dependency for vfree_atomic()
* b75708bc UPSTREAM: mm/damon/vaddr: change asm-generic/mman-common.h to linux/mman.h
* 7cdc4dd8 UPSTREAM: coresight: etm4x: Remove bogous __exit annotation for some functions
* fdaca9c4 UPSTREAM: ASoC: hdmi-codec: register hpd callback on component probe
* 942024e3 UPSTREAM: usb: typec: tcpm: Fix NULL pointer dereference in tcpm_pd_svdm()
* 0c24e4d2 UPSTREAM: crypto: xts - use 'spawn' for underlying single-block cipher
* d7c73d7e UPSTREAM: scsi: ufs: core: Correct clear TM error log
* d5a29659 UPSTREAM: firmware: arm_ffa: Assign the missing IDR allocation ID to the FFA device
* 48083a5b UPSTREAM: mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions()
* 5c0247fa UPSTREAM: ata: libata-scsi: Fix delayed scsi_rescan_device() execution
* 05ec1b13 UPSTREAM: firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND
* 9443d76d UPSTREAM: task_work: add kerneldoc annotation for 'data' argument
* 402051fc ANDROID: export one function for mm metrics
* 62314e2b ANDROID: GKI: rockchip: Add symbols for some charger and
* ce4db248 UPSTREAM: cpuidle: teo: Update idle duration estimate when choosing shallower state
* 18126b26 UPSTREAM: firmware: arm_scmi: Fix chan_free cleanup on SMC
* 2d2a6139 UPSTREAM: clk: Fix memory leak in devm_clk_notifier_register()
* 6eae7cd7 UPSTREAM: selftests: damon: add config file
* 4599499a UPSTREAM: firmware: arm_ffa: Set handle field to zero in memory descriptor
* a1755ffc UPSTREAM: usb: dwc3: qcom: fix wakeup implementation
* 9429d3dd UPSTREAM: kernfs: fix potential NULL dereference in __kernfs_remove
* f6d1a01f ANDROID: irq: put irq_resolve_mapping under protection of __irq_enter_raw
* fd07886c ANDROID: usb: Optimize the problem of slow transfer rate in USB accessory mode
* 4399b7da ANDROID: 16K: Fix show maps CFI failure
* 8a4d40f2 ANDROID: 16K: Handle pad VMA splits and merges
* fda5f612 ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* 115d1ca5 ANDROID: 16K: Only madvise padding from dynamic linker context
* 634ea3b4 ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* 3cbf5a28 ANDROID: 16K: Exclude ELF padding for fault around range
* 7699c552 ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* f2822b2e ANDROID: 16K: Introduce ELF padding representation for VMAs
* a002ae8d ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* 42fe3e15 UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* 7f9f2028 UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* 578bf5a4 UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
* adbb45df UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path
* 6a1e219e UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
* f5b5be36 BACKPORT: mm: update mark_victim tracepoints fields
* 82cf5d6a Revert "FROMGIT: BACKPORT: mm: update mark_victim tracepoints fields"

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