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

Merge branch 'android14-5.15' into branch 'android14-5.15-lts'



Catch up with changes made in android14-5.15, including new symbols to
track the ABI.  Changes included here are the following:

* d83231ef ANDROID: 16K: Handle pad VMA splits and merges
* 19d6e7eb ANDROID: 16K: madvise_vma_pad_pages: Remove filemap_fault check
* ae44e8da ANDROID: 16K: Only madvise padding from dynamic linker context
* ae67f189 ANDROID: Enable CONFIG_LAZY_RCU in x86 gki_defconfig
* d38091b4 ANDROID: Enable CONFIG_LAZY_RCU in arm64 gki_defconfig
* 37b02c19 FROMLIST: rcu: Provide a boot time parameter to control lazy RCU
* 4adb6081 ANDROID: rcu: Add a minimum time for marking boot as completed
* 16ea06fe UPSTREAM: rcu/kvfree: Move need_offload_krc() out of krcp->lock
* 5d1a3986 UPSTREAM: rcu/kfree: Fix kfree_rcu_shrink_count() return value
* 88587c18 UPSTREAM: rcu/kvfree: Update KFREE_DRAIN_JIFFIES interval
* 5b47d841 UPSTREAM: rcu/kvfree: Remove useless monitor_todo flag
* 84828604 UPSTREAM: scsi/scsi_error: Use call_rcu_hurry() instead of call_rcu()
* a4124a21 ANDROID: rxrpc: Use call_rcu_hurry() instead of call_rcu()
* 930bdc09 UPSTREAM: net: devinet: Reduce refcount before grace period
* 706e751b UPSTREAM: rcu: Disable laziness if lazy-tracking says so
* 85685937 UPSTREAM: rcu: Track laziness during boot and suspend
* f12c162e UPSTREAM: net: Use call_rcu_hurry() for dst_release()
* ff22b562 UPSTREAM: percpu-refcount: Use call_rcu_hurry() for atomic switch
* a4cc1aa2 UPSTREAM: rcu/sync: Use call_rcu_hurry() instead of call_rcu
* 222a4cd6 UPSTREAM: rcu: Refactor code a bit in rcu_nocb_do_flush_bypass()
* f4abe7bb BACKPORT: rcu: Shrinker for lazy rcu
* e0297c38 BACKPORT: rcu: Make call_rcu() lazy to save power
* 276d33f2 UPSTREAM: rcu: Fix late wakeup when flush of bypass cblist happens
* 24e67580 BACKPORT: rcu: Fix missing nocb gp wake on rcu_barrier()
* fb310d46 UPSTREAM: netfilter: nft_set_pipapo: do not free live element
* 444a4974 ANDROID: GKI: Update lenovo symbol list
* 978f805a ANDROID: GKI: Export css_task_iter_start()
* 0ae4f326 FROMGIT: coresight: etm4x: Fix access to resource selector registers
* 8ba18022 BACKPORT: FROMGIT: coresight: etm4x: Safe access for TRCQCLTR
* 6a08c9fb FROMGIT: coresight: etm4x: Do not save/restore Data trace control registers
* a02278f9 FROMGIT: coresight: etm4x: Do not hardcode IOMEM access for register restore
* e8e652b8 UPSTREAM: af_unix: Fix garbage collector racing against connect()
* 65e0a92c UPSTREAM: af_unix: Do not use atomic ops for unix_sk(sk)->inflight.
* 5725caa2 FROMLIST: scsi: ufs: Check for completion from the timeout handler
* 8563ce58 BACKPORT: FROMLIST: scsi: ufs: Make the polling code report which command has been completed
* 0fcd7a1c BACKPORT: FROMLIST: scsi: ufs: Make ufshcd_poll() complain about unsupported arguments
* aa07d6b2 ANDROID: scsi: ufs: Unexport ufshcd_mcq_poll_cqe_nolock()
* 25ebc091 ANDROID: mm: fix incorrect unlock mmap_lock for speculative swap fault
* 264477e0 ANDROID: Update the ABI symbol list
* 084d2201 ANDROID: 16K: Separate padding from ELF LOAD segment mappings
* 37ea0e84 ANDROID: 16K: Exclude ELF padding for fault around range
* e7bff50b ANDROID: 16K: Use MADV_DONTNEED to save VMA padding pages.
* 38cccb91 ANDROID: 16K: Introduce ELF padding representation for VMAs
* 9274c308 ANDROID: 16K: Introduce /sys/kernel/mm/pgsize_miration/enabled
* ceb8c595 UPSTREAM: netfilter: nf_tables: release mutex after nft_gc_seq_end from abort path
* ea419cda UPSTREAM: netfilter: nf_tables: release batch on table validation from abort path
* 6b883cda UPSTREAM: netfilter: nf_tables: mark set as dead when unbinding anonymous set with timeout
* f395ea09 ANDROID: GKI: update mtktv symbol
* a5d03f57 UPSTREAM: netfilter: nft_chain_filter: handle NETDEV_UNREGISTER for inet/ingress basechain
* 0cf6fdfb UPSTREAM: HID: playstation: support updated DualSense rumble mode.
* e3da19b2 UPSTREAM: HID: playstation: stop DualSense output work on remove.
* 62085a0e UPSTREAM: HID: playstation: convert to use dev_groups
* adce8aae UPSTREAM: HID: playstation: fix return from dualsense_player_led_set_brightness()
* c996cb50 UPSTREAM: HID: playstation: expose DualSense player LEDs through LED class.
* f011142f UPSTREAM: leds: add new LED_FUNCTION_PLAYER for player LEDs for game controllers.
* 19cbe316 UPSTREAM: HID: playstation: expose DualSense lightbar through a multi-color LED.
* 3507c287 UPSTREAM: mm: update mark_victim tracepoints fields
* cd4da4b7 Revert "FROMGIT: mm: update mark_victim tracepoints fields"
* 948f42ca UPSTREAM: netfilter: nft_set_pipapo: release elements in clone only from destroy path
* 6a455180 ANDROID: GKI: Update symbol list for Amlogic
* 3de9177e ANDROID: GKI: Update symbol list for lenovo
* 668dfb81 FROMLIST: binder: check offset alignment in binder_get_object()
* 3b3c1c80 ANDROID: GKI: Update the ABI symbol list
* f600c62d ANDROID: GKI: Update symbol list for Amlogic
* d154026d ANDROID: GKI: Update the ABI symbol list
* 5f12c91a Merge tag 'android14-5.15.148_r00' into android14-5.15
* ec86765b ANDROID: KVM: arm64: Fix TLB invalidation when coalescing into a block
* 5854f4c2 ANDROID: KVM: arm64: Fix missing trace event for nVHE dyn HVCs
* 865e6d9d UPSTREAM: netfilter: nf_tables: disallow timeout for anonymous sets
* 537e1339 UPSTREAM: arm64: Apply dynamic shadow call stack patching in two passes
* 96305e30 ANDROID: userfaultfd: abort uffdio ops if mmap_lock is contended
* 3673533a ANDROID: userfaultfd: add MMAP_TRYLOCK mode for COPY/ZEROPAGE
* 3fd32dc1 ANDROID: fix isolate_migratepages_range return value
* 483395b4 Revert "ANDROID: Add CONFIG_BLK_DEV_NULL_BLK=m to gki_defconfig"
* 7b301c70 ANDROID: fips140 - fix integrity check by unapplying dynamic SCS
* b1f8c250 ANDROID: fips140 - add option for debugging the integrity check
* 1225d7ed ANDROID: fuse-bpf: Fix readdir for getdents
* 37b83a89 BACKPORT: f2fs: split initial and dynamic conditions for extent_cache
* ac4797ce UPSTREAM: usb: typec: altmodes/displayport: create sysfs nodes as driver's default device attribute group
* 5aed5c34 ANDROID: uid_sys_stat: fix data-error of cputime and io
* c3b70e94 UPSTREAM: usb: typec: class: fix typec_altmode_put_partner to put plugs
* 282bfc6c UPSTREAM: Revert "usb: typec: class: fix typec_altmode_put_partner to put plugs"
* 2390d588 ANDROID: GKI: Update the ABI symbol list
* 0d0784d6 ANDROID: Update ABI for userfaultfd_ctx
* ee9964b3 ANDROID: userfaultfd: allow SPF for UFFD_FEATURE_SIGBUS on private+anon
* 9cef46f3 ANDROID: remove LTO check from build.config.gki.aarch64.fips140
* b74b4cbe Revert "interconnect: Fix locking for runpm vs reclaim"
* f1156618 Revert "interconnect: Teach lockdep about icc_bw_lock order"
* d96725ec BACKPORT: FROMGIT: PM: runtime: add tracepoint for runtime_status changes
* 4403e251 UPSTREAM: netfilter: nft_set_rbtree: skip end interval element from gc
* 288abb8b ANDROID: PCI: dwc: Wait for the link only if it has been started
* ff1e211d ANDROID: null_blk: Support configuring the maximum segment size
* 0ffd03e6 ANDROID: scsi_debug: Support configuring the maximum segment size
* 3ef8e900 ANDROID: block: Make sub_page_limit_queues available in debugfs
* bed88e7c ANDROID: block: Add support for filesystem requests and small segments
* e99e7de8 ANDROID: block: Support submitting passthrough requests with small segments
* 3f6018f1 ANDROID: block: Support configuring limits below the page size
* 025c278e ANDROID: block: Prepare for supporting sub-page limits
* f56ddffe ANDROID: block: Use pr_info() instead of printk(KERN_INFO ...)

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