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

Merge android16-6.12 into android16-6.12-kminext



This merges the android16-6.12 branch into the android16-6.12-kminext branch,
catching it up with the latest changes in there.

It contains the following commits:

* e973ddb1 ANDROID: GKI: update symbol list for galaxy
* da324a10 ANDROID: fuse-bpf: Fix readdir for getdents
* 39bb8df5 ANDROID: fuse-bpf: Fix the issue of abnormal lseek system calls
* ee77e3bb ANDROID: fuse-bpf: Align data structs for 32-bit kernels
* d877b200 UPSTREAM: dm-bufio: fix sched in atomic context
* 2ec13ba6 UPSTREAM: dm-bufio: remove maximum age based eviction
* 3bff0858 ANDROID: Disable IOMMU support for microdroid
* 481d4a35 ANDROID: ABI: Update the symbol list for mtk
* a5cb8a78 ANDROID: Disable BTI and enable UNWIND_PATCH_PAC_INTO_SCS for microdroid
* 1827b85a FROMGIT: media: venus: Fix OOB read due to missing payload bound check
* 2888255b FROMGIT: media: venus: Add a check for packet size after reading from shared memory
* a11268a7 ANDROID: ABI: qcom: Add device_node_to_regmap() API to symbol list
* 7f804a5b ANDROID: ashmem: use strcpy_into_buf in set_name
* 6e80d044 FROMGIT: rust: uaccess: add UserSliceReader::strcpy_into_buf
* 0cb01a7d FROMGIT: rust: uaccess: add strncpy_from_user
* bd6df18c Revert "ANDROID: ashmem: use strncpy_from_user in set_name"
* 603af016 ANDROID: KVM: arm64: Fix missing_map type in hyp_alloc()
* 05ca3af6 Revert "ANDROID: GKI: Update xiaomi symbol list."
* 88ea63a5 Revert "ANDROID: vendor_hooks: export tracepoint symbols"
* 2bd1f363 ANDROID: gunyah: Add new VM status to handle reset failure
* e740e8d9 ANDROID: Sync proxy-exec logic to v19 (from v18)
* 7d6f7afb UPSTREAM: perf/core: Clean up perf_try_init_event()
* 3f5de817 ANDROID: GKI: Update xiaomi symbol list.
* 5d3d6f75 BACKPORT: hung_task: show the blocker task if the task is hung on mutex
* 6b4fffd5 FROMGIT: pinmux: fix race causing mux_owner NULL with active mux_usecount
* 9f514cf3 ANDROID: GKI: add GKI symbol list for Exynosauto SoC
* 21ed8493 UPSTREAM: Revert "usb: xhci: Implement xhci_handshake_check_state() helper"
* 5b3ae3bc BACKPORT: usb: xhci: Skip xhci_reset in xhci_resume if xhci is being removed
* 5c72e9fa ANDROID: rust_binder: adjust errors from death notifications
* 9e02edea ANDROID: rust_binder: use u64 for death cookie
* 4317f0ae ANDROID: f2fs: fixup ABI break due to reserved_pin_section
* 25bdb4a6 Revert "ANDROID: ABI: update symbol list for honor"
* a76eb2b6 ANDROID: GKI: Update oplus symbol list
* 6222007a ANDROID: mm/readahead: add for bypass high order allocation
* 659d7bb4 ANDROID: ABI: Update symbol list for exynos
* 26937a37 ANDROID: MODVERSIONS: hide type definition in drivers/usb/core/driver.c
* 8760b6e4 ANDROID: usb: Add vendor hook for usb suspend and resume
* da662aec FROMLIST: KVM: Avoid synchronize_srcu() in kvm_io_bus_register_dev()
* 4be05c65 FROMLIST: KVM: arm64: vgic: Explicitly implement vgic_dist::ready ordering
* d6045efc FROMLIST: KVM: arm64: vgic-init: Remove vgic_ready() macro
* f06dd0cd ANDROID: rust_binder: release threads before refs
* 5bbd30a6 ANDROID: ABI: Update pixel symbol list
* bafbebf2 ANDROID: GKI: Update symbol list for xiaomi
* b7b130b7 ANDROID: export folio_deactivate() for GKI purpose.
* 41f730f9 ANDROID: GKI: update exynos symbol list
* 766ecae1 UPSTREAM: xhci: dbctty: disable ECHO flag by default
* 8ea40f52 ANDROID: GKI: Update xiaomi symbol list.
* 5594b473 ANDROID: vendor_hooks: export tracepoint symbols
* 0d4cc1da ANDROID: KVM: arm64: Don't update IOMMU under memory pressure
* 672185e5 ANDROID: iommu/iommu: Handle multi-page deferred sg mappings
* 740d42d1 ANDROID: vendor_hooks: Add vendor_hook in futex to fix the OEM scheduling priority bug
* 6eb6f346 ANDROID: ABI: Update symbol list for mtk
* c3020791 ANDROID: vendor_hooks: Add vendor hook for GenieZone demand paging
* 5c1cddc9 ANDROID: vendor_hooks: Add vendor hook for GenieZone para-virtualization
* d893caf1 ANDROID: ashmem_rust: Add support for retrieving an ashmem area's vmfile
* 0be74214 ANDROID: ashmem_rust: Add support for querying the size of an ashmem region
* eb50f663 ANDROID: ashmem_rust: Add support for providing an ashmem region's name
* 6bdbae6e ANDROID: ashmem_rust: Add is_ashmem_file()
* 0d890f86 ANDROID: ABI: update symbol list for honor
* 12727f8a FROMGIT: f2fs: introduce reserved_pin_section sysfs entry
* 286cd9d6 ANDROID: GKI: Update RTK STB KMI symbol list
* 7b4f7682 ANDROID: GKI: Update symbol list for Amlogic
* 862ce4b2 ANDROID: KVM: arm64: iommu: Fix power tracking
* 61184996 ANDROID: drivers/iommu: Fix return value in iommu_map_sg
* acad0cd5 ANDROID: ABI: update symbol list for galaxy
* 393dbad3 ANDROID: vendor_hook: add condition to call for freezing fail
* b62fe47b ANDROID: fix ashmem_rust return EINVAL bug in ashmem_rust.rs
* a7e1300b ANDROID: Revert "cpufreq: Avoid using inconsistent policy->min and policy->max"
* 15d2fe05 ANDROID: qcom: Update the ABI symbol list
* f6ca783b UPSTREAM: scsi: ufs: qcom: Check gear against max gear in vop freq_to_gear()
* 237708e9 ANDROID: GKI: Update symbols list file for honor White list the vm_normal_folio_pmd
* f18e354a ANDROID: mm: export vm_normal_folio_pmd to allow vendors to implement simplified smaps
* c181c478 ANDROID: vendor_hooks: add hook to record slab free
* d2e452e1 ANDROID: Build fixups with PROXY_EXEC v18 + !CONFIG_SMP
* 4f9e4406 ANDROID: Update proxy-exec logic from v14 to v18
* 3fa8dabe ANDROID: GKI: update asr symbols list
* 94310b3f ANDROID: Add the dma header to aarch64 allowlist
* 880d6538 UPSTREAM: usb: gadget: u_serial: Fix race condition in TTY wakeup
* b115bf23 ANDROID: ABI: Update symbol list for mtk
* e87018c5 FROMGIT: sched/deadline: Fix dl_server runtime calculation formula
* e2bf362e FROMGIT: sched/core: Fix migrate_swap() vs. hotplug
* 06ca12d7 ANDROID: GKI: update the ABI symbol list
* 55972ed8 ANDROID: Fixup init_user_ns CRC change
* 4e873ad6 ANDROID: user: Add vendor hook to user for GKI purpose
* a097cd9c ANDROID: export find_user() for GKI purpose.
* 85b8233f ANDROID: rust_binder: use euid from the task
* 969c9048 ANDROID: ashmem: rename VmAreaNew->VmaNew
* 2ab3e5f2 ANDROID: rust_binder: rename VmAreaNew->VmaNew
* 2ef75ab8 ANDROID: rust_binder: use tgid_nr_ns for getting pid
* 6a2be110 UPSTREAM: task: rust: rework how current is accessed
* 602e2300 UPSTREAM: rust: add PidNamespace
* 12dfc1d9 UPSTREAM: rust: miscdevice: add mmap support
* 8e67cb75 UPSTREAM: mm: rust: add VmaNew for f_ops->mmap()
* bd140ddf UPSTREAM: mm: rust: add mmput_async support
* 0c507730 UPSTREAM: mm: rust: add lock_vma_under_rcu
* 0b5465bb UPSTREAM: mm: rust: add vm_insert_page
* d7f52612 UPSTREAM: mm: rust: add vm_area_struct methods that require read access
* f03d4f74 UPSTREAM: mm: rust: add abstraction for struct mm_struct
* 2ef6dbc7 BACKPORT: rust: miscdevice: change how f_ops vtable is constructed
* 1acd3b31 Revert "FROMLIST: mm: rust: add abstraction for struct mm_struct"
* a012c155 Revert "FROMLIST: mm: rust: add vm_area_struct methods that require read access"
* 3be00a9b Revert "FROMLIST: mm: rust: add vm_insert_page"
* 3aed8820 Revert "FROMLIST: mm: rust: add lock_vma_under_rcu"
* a121b6e7 Revert "FROMLIST: mm: rust: add mmput_async support"
* 9248564a Revert "FROMLIST: mm: rust: add VmAreaNew for f_ops->mmap()"
* 6de3ace5 Revert "FROMLIST: rust: miscdevice: add mmap support"
* b7f54dd2 Revert "BACKPORT: FROMLIST: task: rust: rework how current is accessed"
* 5913c80b ANDROID: iommu/arm-smmu-v3-kvm: Fix idmap free_leaf
* c40c54e6 UPSTREAM: erofs: impersonate the opener's credentials when accessing backing file
* 4d0200d0 BACKPORT: erofs: add 'fsoffset' mount option to specify filesystem offset
* 399deda7 ANDROID: scsi: ufs: add UFSHCD_ANDROID_QUIRK_NO_IS_READ_ON_H8
* f6b1ab83 ANDROID: rust_binder: remove binder_logs/procs/pid immediately

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