Commit a01e106f 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 with the latest changes and
abi updates.  Included in here are the following commits:

07775f96 ANDROID: GKI: Add symbols for rockchip sata
f44d373b ANDROID: sched: Add trace_android_rvh_setscheduler
efa8f34b ANDROID: Update the ABI symbol list
cee8ebf7 ANDROID: GKI: build damon for monitoring virtual address spaces
31c59d59 UPSTREAM: mm/damon/sysfs-schemes: handle tried region directory allocation failure
1cedfc05 UPSTREAM: mm/damon/sysfs-schemes: handle tried regions sysfs directory allocation failure
7fbeab3c UPSTREAM: mm/damon/sysfs: check error from damon_sysfs_update_target()
606444fd UPSTREAM: mm/damon/sysfs: eliminate potential uninitialized variable warning
c132d077 UPSTREAM: mm/damon/sysfs: update monitoring target regions for online input commit
6b7c4cc2 UPSTREAM: mm/damon/sysfs: remove requested targets when online-commit inputs
1e19db10 UPSTREAM: mm/damon/sysfs: avoid empty scheme tried regions for large apply interval
c194e597 UPSTREAM: mm/damon/sysfs-schemes: do not update tried regions more than one DAMON snapshot
f5a0a8bc UPSTREAM: mm/damon/sysfs: check DAMOS regions update progress from before_terminate()
b46391e0 UPSTREAM: mm/damon/sysfs: implement a command for updating only schemes tried total bytes
7d48e19f UPSTREAM: mm/damon/sysfs-schemes: implement DAMOS tried total bytes file
a548d909 UPSTREAM: mm/damon/ops-common: refactor to use {pte|pmd}p_clear_young_notify()
ea215c9a UPSTREAM: mm/damon/core: skip apply schemes if empty
3ca21ef5 UPSTREAM: mm/damon: use kstrtobool() instead of strtobool()
5bf7b568 UPSTREAM: mm/damon/sysfs-schemes: implement DAMOS-tried regions clear command
80ccab9b UPSTREAM: mm/damon/sysfs: implement DAMOS tried regions update command
3421250b UPSTREAM: mm/damon/sysfs-schemes: implement scheme region directory
b4c34cc1 UPSTREAM: mm/damon/sysfs-schemes: implement schemes/tried_regions directory
b5d1f357 UPSTREAM: mm/damon/core: add a callback for scheme target regions check
6547a97f UPSTREAM: mm/damon/lru_sort: enable and disable synchronously
540e9b85 UPSTREAM: mm/damon/reclaim: enable and disable synchronously
4e2d3f8e UPSTREAM: mm/damon/{reclaim,lru_sort}: remove unnecessarily included headers
3c0bc73f UPSTREAM: mm/damon/modules: deduplicate init steps for DAMON context setup
67ef7b0f UPSTREAM: mm/damon/sysfs: split out schemes directory implementation to separate file
0b17df8a UPSTREAM: mm/damon/sysfs: split out kdamond-independent schemes stats update logic into a new function
a45dff56 UPSTREAM: mm/damon/sysfs: move unsigned long range directory to common module
c5038d80 UPSTREAM: mm/damon/sysfs: move sysfs_lock to common module
b7fc8d59 UPSTREAM: mm/damon/sysfs: remove parameters of damon_sysfs_region_alloc()
19364f11 UPSTREAM: mm/damon/sysfs: use damon_addr_range for region's start and end values
b6e6b1db UPSTREAM: mm/damon/core: split out scheme quota adjustment logic into a new function
43475d97 UPSTREAM: mm/damon/core: split out scheme stat update logic into a new function
0b0a4302 UPSTREAM: mm/damon/core: split damos application logic into a new function
6c7495f0 UPSTREAM: mm/damon/core: split out DAMOS-charged region skip logic into a new function
ac103161 ANDROID: Snapshot Mainline's version of checkpatch.pl
4fa87d4d ANDROID: KVM: arm64: Skip prefaulting ptes which will be modified later
fbc70744 ANDROID: KVM: arm64: Introduce module_change_host_prot_range
fd720ebc ANDROID: KVM: arm64: Relax checks in module_change_host_page_prot
f082d225 ANDROID: KVM: arm64: Optimise module_change_host_page_prot
01dd8c28 ANDROID: KVM: arm64: Prefault entries when splitting a block mapping
cc653d70 ANDROID: virt: gunyah: Zero state_data after vcpu_run
cc294d95 ANDROID: Update the ABI symbol list
956a0d39 ANDROID: fs: Add vendor hooks for ep_create_wakeup_source & timerfd_create
d8d2b95f ANDROID: ABI: update symbol list for galaxy
bcc758ee Reapply "binder: fix UAF caused by faulty buffer cleanup"
b2b3a1e6 UPSTREAM: x86/sev: Check for user-space IOIO pointing to kernel space
62b97630 UPSTREAM: x86/sev: Check IOBM for IOIO exceptions from user-space
071c1469 FROMGIT: usb: typec: tcpm: skip checking port->send_discover in PD3.0
a9567a35 ANDROID: arm64: Disable workaround for CPU errata 2441007 and 2441009

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