Commit 96e5d6e9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Sync back up with changes in the android13-5.10 branch to catch the new
symbols that we need to track properly.

29c42766 Merge tag 'android13-5.10.149_r00' into android13-5.10
70be8655 ANDROID: Update the ABI representation
57e680a1 ANDROID: Sched: Add restricted vendor hook in update_misfit_status()
64b76061 ANDROID: Sched: Add restricted vendor hook in schedule()
ef815ee8 ANDROID: Sched: Add restricted vendor hook in wake_up_new_task()
b7dbea10 ANDROID: Fix license for BUILD.bazel file.
c45168c6 ANDROID: kleaf: load() then package().
2ff20aee ANDROID: update the .xml ABI file due to LTS changes.
887fa8f0 Revert "mtd: fix 'part' field data corruption in mtd_info"
e6a51ad9 Revert "audit: log AUDIT_TIME_* records only from rules"
cac3a605 Merge 64f18041 ("Merge branch 'android13-5.10' into branch 'android13-5.10-lts'") into android13-5.10-lts
cc59c47a ANDROID: GKI: rockchip: Enable symbols for charger and battery
fd1290ee ANDROID: GKI: MGLRU ABI Fixup
e0f24fb5 ANDROID: GKI: Build multi-gen LRU
92c47e2a ANDROID: Make MGLRU aware of speculative faults
9d5b3a15 BACKPORT: mm: multi-gen LRU: design doc
ee101878 UPSTREAM: mm: multi-gen LRU: admin guide
86b88981 BACKPORT: mm: multi-gen LRU: debugfs interface
3369bf02 UPSTREAM: mm: multi-gen LRU: thrashing prevention
e9983679 BACKPORT: mm: multi-gen LRU: kill switch
e4ed6372 BACKPORT: mm: multi-gen LRU: optimize multiple memcgs
c2869b6c BACKPORT: mm: multi-gen LRU: support page table walks
fd80133d BACKPORT: mm: multi-gen LRU: exploit locality in rmap
8455e88f BACKPORT: mm: multi-gen LRU: minimal implementation
278f5680 BACKPORT: mm: multi-gen LRU: groundwork
245ea1de BACKPORT: mm/vmscan.c: refactor shrink_node()
4ccde30a BACKPORT: mm: x86: add CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG
f04c2fba BACKPORT: mm: x86, arm64: add arch_has_hw_pte_young()
69100862 Revert "FROMLIST: mm: x86, arm64: add arch_has_hw_pte_young()"
4741bcba Revert "FROMLIST: mm: x86: add CONFIG_ARCH_HAS_NONLEAF_PMD_YOUNG"
a38ef3be Revert "FROMLIST: mm/vmscan.c: refactor shrink_node()"
ead7512d Revert "FROMLIST: mm: multi-gen LRU: groundwork"
b61dbc57 Revert "FROMLIST: mm: multi-gen LRU: minimal implementation"
7a2929e6 Revert "FROMLIST: mm: multi-gen LRU: exploit locality in rmap"
db1832bb Revert "FROMLIST: mm: multi-gen LRU: support page table walks"
6fa2a68b Revert "FROMLIST: mm: multi-gen LRU: optimize multiple memcgs"
56c66e7c Revert "FROMLIST: mm: multi-gen LRU: kill switch"
06e6006a Revert "FROMLIST: mm: multi-gen LRU: thrashing prevention"
0d9f7bf3 Revert "FROMLIST: mm: multi-gen LRU: debugfs interface"
43c49618 Revert "FROMLIST: mm: multi-gen LRU: admin guide"
3676a0c2 Revert "FROMLIST: mm: multi-gen LRU: design doc"
66f2c698 Revert "ANDROID: GKI: build multi-gen LRU"
40dd81e3 Revert "ANDROID: Make MGLRU aware of speculative faults"
baa23246 UPSTREAM: binder: Gracefully handle BINDER_TYPE_FDA objects with num_fds=0
3d213a62 UPSTREAM: binder: Address corner cases in deferred copy and fixup
9d1efccf UPSTREAM: binder: fix pointer cast warning
b83173bf UPSTREAM: binder: defer copies of pre-patched txn data
aaf23697 UPSTREAM: binder: read pre-translated fds from sender buffer
ecf61e4e UPSTREAM: binder: avoid potential data leakage when copying txn
3767674e ANDROID: khugepaged: fix mixing declarations warning in retract_page_tables
c440edc7 ANDROID: mm: fix build issue in spf when CONFIG_USERFAULTFD=n
2a62463d UPSTREAM: f2fs: don't use casefolded comparison for "." and ".."
c63efa67 UPSTREAM: regulator: scmi: Fix refcount leak in scmi_regulator_probe
9b8948cb UPSTREAM: KVM: arm64: vgic-v3: Consistently populate ID_AA64PFR0_EL1.GIC
3bba44a8 UPSTREAM: block/mq-deadline: Set the fifo_time member also if inserting at head
49823ad2 BACKPORT: Revert "mm/cma.c: remove redundant cma_mutex lock"
fb3cba18 UPSTREAM: module.h: simplify MODULE_IMPORT_NS
9257ade3 UPSTREAM: procfs: prevent unprivileged processes accessing fdinfo dir
ae1f81f7 UPSTREAM: KVM: arm64: nvhe: Eliminate kernel-doc warnings
17d733d0 UPSTREAM: iommu/mediatek: Add mutex for m4u_group and m4u_dom in data
b66bdcef UPSTREAM: iommu/mediatek: Remove clk_disable in mtk_iommu_remove
c19e8027 UPSTREAM: iommu/mediatek: Fix 2 HW sharing pgtable issue
80b363ae UPSTREAM: mm: hugetlb: add missing cache flushing in hugetlb_unshare_all_pmds()
4d39f905 UPSTREAM: firmware: arm_ffa: Remove incorrect assignment of driver_data
d57c415a UPSTREAM: firmware: arm_ffa: Fix uuid parameter to ffa_partition_probe
dba02a02 UPSTREAM: selftests/damon: add damon to selftests root Makefile
9e059fe0 BACKPORT: KVM: arm64: Actually prevent SMC64 SYSTEM_RESET2 from AArch32
c6408580 UPSTREAM: KVM: arm64: Generally disallow SMC64 for AArch32 guests
1eed68cd UPSTREAM: irqchip/gic-v4: Wait for GICR_VPENDBASER.Dirty to clear before descheduling
968c524d UPSTREAM: virtio: use virtio_device_ready() in virtio_device_restore()
9eaf45a2 UPSTREAM: mm: kfence: fix missing objcg housekeeping for SLAB
7923c77f UPSTREAM: fs: erofs: add sanity check for kobject in erofs_unregister_sysfs
e7bbb894 UPSTREAM: clk: Fix clk_hw_get_clk() when dev is NULL
69914efc UPSTREAM: arm64: kasan: fix include error in MTE functions
2be9d2b2 UPSTREAM: arm64: prevent instrumentation of bp hardening callbacks
2917f48b UPSTREAM: PM: domains: Fix sleep-in-atomic bug caused by genpd_debug_remove()
d9612d61 UPSTREAM: mm: fix use-after-free bug when mm->mmap is reused after being freed
3b68c114 UPSTREAM: kasan: test: prevent cache merging in kmem_cache_double_destroy
d27c600b BACKPORT: vsprintf: Fix %pK with kptr_restrict == 0
75a8a2c6 ANDROID: KVM: arm64: Use 32-bit function ID for PSCI MEM_PROTECT call
24ba7e97 UPSTREAM: efi: capsule-loader: Fix use-after-free in efi_capsule_write
d2426b06 UPSTREAM: net: preserve skb_end_offset() in skb_unclone_keeptruesize()
2ea1a8c4 BACKPORT: net: add skb_set_end_offset() helper
7d40247c UPSTREAM: arm64: Correct wrong label in macro __init_el2_gicv3
cb515c66 UPSTREAM: KVM: arm64: Stop handle_exit() from handling HVC twice when an SError occurs
316b7560 UPSTREAM: KVM: arm64: Avoid consuming a stale esr value when SError occur
e3e5b3b8 UPSTREAM: usb: typec: tcpm: Do not disconnect when receiving VSAFE0V
2317bc53 UPSTREAM: usb: typec: tcpci: don't touch CC line if it's Vconn source
8f2ac1de UPSTREAM: dt-bindings: memory: mtk-smi: Correct minItems to 2 for the gals clocks
72decd97 BACKPORT: dt-bindings: memory: mtk-smi: No need mediatek,larb-id for mt8167
33e48191 BACKPORT: dt-bindings: memory: mtk-smi: Rename clock to clocks
85145181 UPSTREAM: dma-buf: cma_heap: Fix mutex locking section
c8f988d0 UPSTREAM: scsi: core: Declare 'scsi_scan_type' static
f3fe2dac UPSTREAM: scsi: core: Suppress a kernel-doc warning
17b50edf UPSTREAM: dma-buf: DMABUF_SYSFS_STATS should depend on DMA_SHARED_BUFFER
4ececb4e UPSTREAM: clk: versatile: Depend on HAS_IOMEM
9b70ff66 BACKPORT: arm64: meson: select COMMON_CLK
05fbbf0d UPSTREAM: tools: do not include scripts/Kbuild.include
924872e5 UPSTREAM: kbuild: dummy-tools: adjust to scripts/cc-version.sh
252e42f3 UPSTREAM: kbuild: do not include include/config/auto.conf from adjust_autoksyms.sh
b9a8323f UPSTREAM: scsi: docs: ABI: sysfs-driver-ufs: Add DeepSleep power mode
26369cde ANDROID: gki_defconfig: enable CONFIG_USB_CONFIGFS_F_UVC
0481654d ANDROID: mm: disable speculative page faults for CONFIG_NUMA
f6ddc1c4 ANDROID: mm: fix invalid backport in speculative page fault path
c3f0fd79 ANDROID: disable page table moves when speculative page faults are enabled
3d3b77c9 ANDROID: mm: assert that mmap_lock is taken exclusively in vm_write_begin
df62da39 ANDROID: mm: remove sequence counting when mmap_lock is not exclusively owned
66544e79 ANDROID: mm/khugepaged: add missing vm_write_{begin|end}
2a3979df BACKPORT: FROMLIST: mm: implement speculative handling in filemap_fault()
ec35e912 ANDROID: mm: prevent reads of unstable pmd during speculation
ce7fa702 ANDROID: mm: prevent speculative page fault handling for in do_swap_page()
4812532e ANDROID: mm: prevent speculative page fault handling for userfaults
43247cf5 ANDROID: mm: skip pte_alloc during speculative page fault
2f2dc42f ANDROID: GKI: rockchip: Add symbols for cpufreq
c8f45c49 ANDROID: Update the ABI representation
0fabf234 ANDROID: sched: add hook point in do_sched_yield()
2aed2a7c ANDROID: KVM: arm64: s2mpu: Fix SYNC latency regression
e1ea4666 ANDROID: KVM: arm64: iommu: Add host_stage2_idmap_complete
15e65b4a ANDROID: KVM: arm64: Issue CMOs when tearing down shadow pages
80fcf382 ANDROID: Add ashmem ioctl to return a unique file identifier
056ee87d ANDROID: Update the ABI representation
b6cfd9d6 ANDROID: KVM: arm64: Fix repainting of PSCI SYSTEM_RESET2 calls
03b60942 ANDROID: Update the ABI representation
d08c3d3b ANDROID: Update the ABI representation
01645da2 ANDROID: Update the ABI representation
6c86db3f ANDROID: Update the ABI representation
db144888 ANDROID: kernel: sched: Export reweight_task
6f642cd2 FROMGIT: f2fs: allow to read node block after shutdown
92a7e867 FROMGIT: usb: core: stop USB enumeration if too many retries
f3fe2e66 ANDROID: KVM: arm64: Adjust PSCI MEM_PROTECT refcount across share/unshare
e7b635a5 BACKPORT: ext4,f2fs: fix readahead of verity data
c57ed318 ANDROID: Update the ABI representation
bcf1e503 ANDROID: adjust vendor hook to control blk_plug
6cbaa88f ANDROID: dm-user: Remove bio recount in I/O path
69e2e927 ANDROID: Update the ABI representation
501eeee6 UPSTREAM: irqchip/tegra: Fix overflow implicit truncation warnings
13a5e047 UPSTREAM: drm/meson: Fix overflow implicit truncation warnings
55a29102 UPSTREAM: video: fbdev: pxa3xx-gcu: Fix integer overflow in pxa3xx_gcu_write
52e7aa32 FROMLIST: KVM: arm64: pkvm: Fixup boot mode to reflect that the kernel resumes from EL1
bcb19fa2 ANDROID: GKI: Add symbol list for exynos
9e3ae1fb UPSTREAM: sched: Fix yet more sched_fork() races
3de7d142 BACKPORT: KVM: arm64: Fix bad dereference on MTE-enabled systems
b684150a FROMLIST: binder: fix UAF of alloc->vma in race with munmap()
9ffd177d ANDROID: Update the ABI representation
89fed373 ANDROID: vendor hook to control blk_plug for shrink_lruvec
c0ce22ab UPSTREAM: mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
75c194cf UPSTREAM: af_key: Do not call xfrm_probe_algs in parallel
8812ab3f UPSTREAM: mm: Force TLB flush for PFNMAP mappings before unlink_file_vma()
4e97b7ff ANDROID: KVM: arm64: Donate memory per vcpu for each vcpu shadow state
6a7700c5 ANDROID: KVM: arm64: Initialize shadow vcpus with separate hypercalls
0b7f3b96 ANDROID: KVM: arm64: Refactor unpinning host vcpu
d345371d ANDROID: KVM: arm64: Separate functions for shadow vm and vcpu init
66be6be8 ANDROID: KVM: arm64: Refactor code for reclaiming guest memory into a function
232bdcbd ANDROID: pass argument in zap_pte_range vendor hooks
a83ef907 ANDROID: GKI: Add for rockchip platform basic symbol
05c1e5a6 ANDROID: GKI: Add Bazel rockchip symbol list entry
56e639d3 ANDROID: sched: check on_rq in freezer_should_skip()
90a47b62 ANDROID: Update the ABI representation
14c81769 ANDROID: KVM: arm64: Only unpin a vCPU SVE state if set
559e6700 ANDROID: Update the ABI representation
9966a706 FROMGIT: f2fs: let's avoid to get cp_rwsem twice by f2fs_evict_inode by d_invalidate
86d28351 ANDROID: Update the ABI representation
a17e132e ANDROID: vendor hook to control blk_plug for memory reclaim
1c741865 ANDROID: Update the ABI representation
6c543641 UPSTREAM: wifi: mac80211: fix MBSSID parsing use-after-free
187e6dad UPSTREAM: wifi: mac80211: don't parse mbssid in assoc response
12bd079b UPSTREAM: mac80211: mlme: find auth challenge directly
13c3ed22 UPSTREAM: wifi: cfg80211: update hidden BSSes to avoid WARN_ON
4bff4599 UPSTREAM: wifi: mac80211: fix crash in beacon protection for P2P-device
7e9ccb51 UPSTREAM: wifi: mac80211_hwsim: avoid mac80211 warning on bad rate
88b3da76 UPSTREAM: wifi: cfg80211: avoid nontransmitted BSS list corruption
1e18328c UPSTREAM: wifi: cfg80211: fix BSS refcounting bugs
d56839bb UPSTREAM: wifi: cfg80211: ensure length byte is present before access
d96c2b59 UPSTREAM: wifi: cfg80211/mac80211: reject bad MBSSID elements
4ae8e2c2 UPSTREAM: wifi: cfg80211: fix u8 overflow in cfg80211_update_notlisted_nontrans()
6e0df303 ANDROID: Update the ABI representation
74e2ea26 ANDROID: vendor hook to control bh_lru and lru_cache_disable
f45d10e8 ANDROID: Update the ABI representation
d257ef67 ANDROID: vendor hook for TLB batching control
2823b388 UPSTREAM: fbcon: Prevent that screen size is smaller than font size
739b963e UPSTREAM: fbcon: Disallow setting font bigger than screen size
cf3742cb UPSTREAM: fbmem: Check virtual screen sizes in fb_set_var()
788ba5e9 ANDROID: GKI: Add build for rockchip platform
90db4c38 ANDROID: Update the ABI representation
2f8253b7 ANDROID: vendor hook to control pagevec flush
992b5f98 ANDROID: KVM: arm64: s2mpu: Add SysMMU_SYNC timeout
19424168 ANDROID: KVM: arm64: Force CMOs with FWB when reclaiming guest pages
f177a280 ANDROID: KVM: arm64: Fix MMIO guard map error handling
32bef95f UPSTREAM: psi: Fix psi state corruption when schedule() races with cgroup move
e4c738dd ANDROID: Update the ABI representation
07e046b9 BACKPORT: HID: steam: Prevent NULL pointer dereference in steam_{recv,send}_report
b3668786 ANDROID: KVM: arm64: Fix MMIO guard unmap
befd3e39 UPSTREAM: crypto: jitter - add oversampling of noise source
6ed90e98 ANDROID: Update the ABI representation
9a8b45a9 FROMGIT: f2fs: support recording stop_checkpoint reason into super_block

.xml file updated with the abi preservation change:

type 'struct sk_buff' changed
  member 'union { struct { __u8 scm_io_uring; __u8 android_kabi_reserved1_padding1; __u16 android_kabi_reserved1_padding2; __u32 android_kabi_reserved1_padding3; }; struct { u64 android_kabi_reserved1; }; union { }; }' was added
  member 'u64 android_kabi_reserved1' was removed

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