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

Merge android14-6.1 into android14-6.1-lts



This merges the android14-6.1 branch into the -lts branch, catching
it up with the latest changes in there.

It contains the following commits:

* 64f51094 Merge tag 'android14-6.1.155_r00' into android14-6.1
* a59fa49d UPSTREAM: f2fs: allow checkpoint=disable for zoned block device
* 9fc74c85 ANDROID: GKI: Enable CONFIG_POSIX_MQUEUE.
* 7ca912bf UPSTREAM: f2fs: atomic: fix to forbid dio in atomic_file
* 09edd785 ANDROID: crypto: af_alg - Fix assignment from bitfield
* 22c0b723 ANDROID: PM: Fix suspend spinlock in IRQ context
* 93de8c8e UPSTREAM: crypto: af_alg - Disallow concurrent writes in af_alg_sendmsg
* 24be8a7d ANDROID: ABI: Update the symbol list for mtk
* ce7ac91b ANDROID: GKI: Honor add symbols to symbol list
* 8e5dd7d2 ANDROID: mm: Add a vendor hook to identify and protect foreground app file pages in kernel
* c65cfeb3 ANDROID: vendor_hooks: Modify the location of trace_android_vh_nr_pcp_alloc
* 11f4a309 UPSTREAM: soc: qcom: mdt_loader: Deal with zero e_shentsize
* 1729ceeb UPSTREAM: soc: qcom: mdt_loader: Fix error return values in mdt_header_valid()
* 1257aa45 UPSTREAM: tls: make sure to abort the stream if headers are bogus
* b328aff1 UPSTREAM: cpufreq: scmi: Account for malformed DT in scmi_dev_used_by_cpus()
* 775e02ce ANDROID: mm: page_alloc: Use scaled batch size for PCP refills
* f6787ec8 ANDROID: GKI: Honor add symbols to symbol list
* 721664f4 ANDROID: mm: add vendor hooks to adjust memory reclamation
* 8267a853 ANDROID: GKI: Update rockchip symbols for motorcomm ethernet phy driver
* 5303560e UPSTREAM: eventpoll: don't decrement ep refcount while still holding the ep mutex

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