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

Merge branch 'android14-6.1' into branch 'android14-6.1-lts'



This catches the android14-6.1-lts branch up to date with recent changes
in the android14-6.1 branch, including symbol additions which are
required for us to track in the LTS branch.

Included in here are the following commits:

* 0a5aada7 ANDROID: GKI: Update symbol list for mtk
* 34a15d35 UPSTREAM: usb: gadget: ncm: Avoid dropping datagrams of properly parsed NTBs
* bd552fcb ANDROID: GKI: Update rockchip symbols to add iova APIs
* 4ed706c2 FROMLIST: sched/pi: Reweight fair_policy() tasks when inheriting prio
* b1e11ffd ANDROID: Update the ABI symbol list
* 29a00abe ANDROID: mm: Add restricted vendor hook in do_read_fault()
* 51c42138 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* a9dca663 ANDROID: Update the ABI symbol list
* 6316af10 ANDROID: add vendor hooks and expoert reclaim_pages to reclaim memory
* 1d241d97 FROMGIT: usb: dwc3: Wait unconditionally after issuing EndXfer command
* f9ca61c8 ANDROID: ABI: Update honor symbol list
* c7fcb9bf ANDROID: add vendor hook in do_read_fault to tune fault_around_bytes
* 23f2a9f5 ANDROID: usb: Optimize the problem of slow transfer rate in USB accessory mode
* 6a3d68af ANDROID: Zap kernel/sched/android.h stubs
* 274e3e96 ANDROID: export one function for mm metrics
* 117a9412 ANDROID: Update the ABI symbol list
* 0d080e01 ANDROID: Export sysctl_sched_wakeup_granularity to enable modifying it
* 039d2a95 UPSTREAM: ALSA: virtio: use ack callback
* 47dfe41d UPSTREAM: usb: typec: tcpm: clear pd_event queue in PORT_RESET
* 93188d77 BACKPORT: usb: typec: tcpm: enforce ready state when queueing alt mode vdm
* 4d55129a UPSTREAM: crypto: x86/curve25519 - disable gcov
* cf685d2b ANDROID: GKI: Update QCOM symbol list and ABI STG
* fae94bc4 ANDROID: GKI: update symbol list file for xiaomi
* d5e04556 UPSTREAM: netfilter: nft_set_pipapo: do not free live element
* dc6facfe UPSTREAM: net: tls: handle backlogging of crypto requests
* 1794308d ANDROID: 16K: Fix show maps CFI failure
* 72a9c0a2 ANDROID: 16K: Handle pad VMA splits and merges
* b86b5cb2 ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* 1657717c ANDROID: 16K: Only madvise padding from dynamic linker context
* 2ca5e076 ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* 1537dbe2 ANDROID: 16K: Exclude ELF padding for fault around range
* 6815ef31 ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* 6b9e4046 ANDROID: 16K: Introduce ELF padding representation for VMAs
* e79c1d45 ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* ea3c70fb FROMGIT: usb: typec: tcpm: Check for port partner validity before consuming it
* 13f322e9 Revert "FROMGIT: usb: typec: tcpm: Check for port partner validity before consuming it"
* 6657c436 FROMGIT: usb: typec: tcpm: Check for port partner validity before consuming it
* 1d37bc99 ANDROID: vendor_hooks: add symbols for lazy preemption
* 14f07c1d ANDROID: vendor_hooks: add two hooks for lazy preemption
* 6364d594 ANDROID: KVM: arm64: wait_for_initramfs for pKVM module loading procfs
* 4744b3a4 ANDROID: GKI: Expose device async to userspace
* 08cc4037 FROMGIT: coresight: etm4x: Fix access to resource selector registers
* 7ff05439 FROMGIT: coresight: etm4x: Safe access for TRCQCLTR
* f401cce7 FROMGIT: coresight: etm4x: Do not save/restore Data trace control registers
* d9604db0 FROMGIT: coresight: etm4x: Do not hardcode IOMEM access for register restore
* fa87a072 ANDROID: GKI: Update honda symbol list for led-trigger
* c61278bb ANDROID: GKI: Update symbols to symbol list
* 260bfad6 ANDROID: vendor_hook: Add hooks to support reader optimistic spin in rwsem
* d0c6724b UPSTREAM: af_unix: Fix garbage collector racing against connect()
* 94c88f80 UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
* 3dfddcb9 ANDROID: GKI: fix ABI breakage in struct userfaultfd_ctx
* 8dd482be UPSTREAM: userfaultfd: fix deadlock warning when locking src and dst VMAs
* ce2896c0 BACKPORT: userfaultfd: use per-vma locks in userfaultfd operations
* daf0b0fc BACKPORT: mm: add vma_assert_locked() for !CONFIG_PER_VMA_LOCK
* a5b6040d BACKPORT: userfaultfd: protect mmap_changing with rw_sem in userfaulfd_ctx
* 6b5ee039 BACKPORT: userfaultfd: move userfaultfd_ctx struct to header file
* ac96edb5 BACKPORT: userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb
* 51eab7ec BACKPORT: selftests/mm: add separate UFFDIO_MOVE test for PMD splitting
* f1526915 BACKPORT: selftests/mm: add UFFDIO_MOVE ioctl test
* a5d504c0 BACKPORT: selftests/mm: add uffd_test_case_ops to allow test case-specific operations
* ee72d5a7 BACKPORT: selftests/mm: call uffd_test_ctx_clear at the end of the test
* abd6748b UPSTREAM: userfaultfd: fix return error if mmap_changing is non-zero in MOVE ioctl
* 4f658d77 BACKPORT: userfaultfd: change src_folio after ensuring it's unpinned in UFFDIO_MOVE
* bfb4b24b BACKPORT: mm: userfaultfd: fix unexpected change to src_folio when UFFDIO_MOVE fails
* 6ecd08ea BACKPORT: userfaultfd: handle zeropage moves by UFFDIO_MOVE
* e275c2b7 UPSTREAM: userfaultfd: avoid huge_zero_page in UFFDIO_MOVE
* 60c5a0e0 UPSTREAM: userfaultfd: fix move_pages_pte() splitting folio under RCU read lock
* 5025ad14 BACKPORT: userfaultfd: UFFDIO_MOVE uABI
* 25db7c13 UPSTREAM: mm/rmap: support move to different root anon_vma in folio_move_anon_rmap()
* 503add18 ANDROID: PM: hibernate: Encryption support with compression
* 3e99ae28 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 8f08ea0d ANDROID: vendor_hooks: Add hooks to support hibernation
* e7e89326 ANDROID: gki_defconfig: Sync gki_defconfig
* 54c2418b UPSTREAM: PM: hibernate: Support to select compression algorithm
* 76c7e974 UPSTREAM: PM: hibernate: Add support for LZ4 compression for hibernation
* 990d3701 BACKPORT: PM: hibernate: Move to crypto APIs for LZO compression
* d224d17a BACKPORT: PM: hibernate: Rename lzo* to make it generic
* dcb09569 ANDROID: ABI: Update symbol list for Exynos SoC
* 692e3553 ANDROID: abi_gki_aarch64_qcom: Update symbol list
* 8943be7d BACKPORT: mtk-mmsys: Change mtk-mmsys & mtk-mutex to modules
* 34e8dc4e BACKPORT: clk: mediatek: Split configuration options for MT8186 clock drivers
* a5ce1467 BACKPORT: clk: mediatek: Add MODULE_LICENSE() where missing
* 4bfe25d0 ANDROID: Update the ABI symbol list
* 24edb63b Reapply "ANDROID: block: Add support for filesystem requests and small segments"
* 141ebdcb UPSTREAM: usb:typec:tcpm:support double Rp to Vbus cable as sink
* 8672a5ee ANDROID: Update the ABI symbol list

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