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

Merge android13-5.15 into android13-5.15-lts



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

It contains the following commits:

* 25a456b5 Merge tag 'android13-5.15.185_r00' into android13-5.15
* 2ed6a4c6 ANDROID: vendor_hooks: add symbols for lazy preemption
* 8b8ff9ae ANDROID: vendor_hooks: add one hook for lazy preemption
* fcf6bc55 ANDROID: GKI: Update symbol list for MTK
* 28215ba4 FROMGIT: f2fs: sysfs: export linear_lookup in features directory
* 401f0dab FROMGIT: f2fs: sysfs: add encoding_flags entry
* 1bda8e1c FROMGIT: f2fs: support to disable linear lookup fallback
* 06f12cdc ANDROID: GKI: Update symbol list for Amlogic
* 09ad63d6 Revert "ANDROID: usb: Optimization the transfer rate of accessory mode in USB3.2 mode"
* aff31aef BACKPORT: binder: Create safe versions of binder log files
* 1a2bb9fa UPSTREAM: binder: Refactor binder_node print synchronization
* 704c8566 ANDROID: GKI: Add symbols to symbol list for oppo
* 1789a723 ANDROID: mm: add vendor hook to activate/unactivate folios
* 2f9eb8eb ANDROID: GKI: Update oplus symbol list
* deef1c2f ANDROID: mm: add vendor hooks for file folio reclaim.
* b61cb943 ANDROID: vendor_hooks: mm: Add tune_swappiness vendor hook in get_swappiness()
* 8c5af78b ANDROID: mm: add vendor hooks to adjust memory reclamation
* 8215ab68 ANDROID: mm: Add vendor hook in pagecache_get_page()
* a62ad076 ANDROID: vendor_hooks: add hooks for extra memory
* 54677afc ANDROID: mm: export isolate_folio and reclaim_pages
* f4357ac5 UPSTREAM: usb: gadget: f_midi: Fixing wMaxPacketSize exceeded issue during MIDI bind retries
* dc5cf21c UPSTREAM: scsi: ufs: core: Fix the HIGH/LOW_TEMP Bit Definitions
* bc881bfc UPSTREAM: crypto: api - Fix boot-up self-test race
* 78433898 UPSTREAM: wifi: nl80211: fix NL80211_ATTR_MLO_LINK_ID off-by-one
* b3af89c2 UPSTREAM: f2fs: compress: fix error path of inc_valid_block_count()
* 8d89d899 BACKPORT: f2fs: compress: fix to avoid inconsistence bewteen i_blocks and dnode
* 0c258fac BACKPORT: mm/memcg: use kmem_cache when alloc memcg pernode info
* 1c9f4af5 BACKPORT: mm/memcg: use kmem_cache when alloc memcg
* f31787a3 UPSTREAM: mm/memcg: move mem_cgroup_init() ahead of cgroup_init()
* 8eda83c7 ANDROID: GKI: Update symbol list for Amlogic
* 2b7d7bb6 ANDROID: GKI: Add symbols to symbol list for oppo

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