Commit e08d8b7f 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:

* 14772101 ANDROID: abi_gki_aarch64_qcom: Add PCIe ECAM related symbols
* 5ea45f74 ANDROID: GKI: Export tracepoint tcp_retransmit_skb
* 941a6c68 ANDROID: GKI: Update symbol list for vivo
* 45271a2c Merge tag 'android14-6.1.141_r00' into android14-6.1
* f6c21bc9 ANDROID: GKI: net: add vendor hooks net qos for gki purpose
* 8f7e256d ANDROID: GKI: Update symbol list for vivo
* b6fa3795 ANDROID: GKI: net: add vendor hooks net qos for gki purpose
* ba450694 Revert "ANDROID: mm: Set PAGE_BLOCK_ORDER to 8 when ARM64_16K_PAGES"
* 6246d345 ANDROID: mm: Set PAGE_BLOCK_ORDER to 8 when ARM64_16K_PAGES
* 74db64dc ANDROID: GKI: Update symbol list for vivo
* 0c598011 ANDROID: vendor_hooks: add hook to retry mempool allocation without delay
* 312cb0bd BACKPORT: FROMGIT: mm: Add CONFIG_PAGE_BLOCK_ORDER to select page block order
* 5b2e204a BACKPORT: binder: Create safe versions of binder log files
* 1fee46d0 UPSTREAM: binder: Refactor binder_node print synchronization
* 47e5d7e9 FROMGIT: scsi: core: ufs: Fix a hang in the error handler
* 13ff1300 BACKPORT: erofs: allocate more short-lived pages from reserved pool first
* 753068e2 ANDROID: GKI: Add zebra KMI symbol list
* 7af56ffc UPSTREAM: f2fs: compress: fix error path of inc_valid_block_count()
* d8780220 UPSTREAM: scripts/unifdef: avoid constexpr keyword
* 3048ff69 ANDROID: GKI: Update symbol list file for xiaomi
* 7f2f532b ANDROID: mm: export __pte_offset_map/unuse_swap_pte/read_swap_cache_async
* 4cf22d97 FROMGIT: f2fs: sysfs: export linear_lookup in features directory
* 1619abb4 FROMGIT: f2fs: sysfs: add encoding_flags entry
* 78be72f6 FROMGIT: f2fs: support to disable linear lookup fallback
* 5b87067c UPSTREAM: mm/memcg: use kmem_cache when alloc memcg pernode info
* 19d3046b BACKPORT: mm/memcg: use kmem_cache when alloc memcg
* db3b80e2 UPSTREAM: mm/memcg: move mem_cgroup_init() ahead of cgroup_init()
* db710ea8 BACKPORT: mm: avoid unconditional one-tick sleep when swapcache_prepare fails

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