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

Merge android15-6.6 into android15-6.6-lts



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

It contains the following commits:

* a95f39af ANDROID: Disable miscellaneous features from microdroid kernels
* 49296015 ANDROID: Use small core data structures for microdroid kernels
* a545398b ANDROID: Reduce perturb table size for microdroid kernels
* 830484fc ANDROID: Remove byte queue limit and RPS support from microdroid's kernels
* 0d71df3e UPSTREAM: net: allow rps/rfs related configs to be switched
* e9c9ce36 UPSTREAM: net: bql: allow the config to be disabled
* 4581e739 ANDROID: KVM: add pkvm_el2_mod_call_smccc() macro
* b81b7955 ANDROID: Enable SVE support also for the microdroid crashdump kernel
* 547910b5 ANDROID: GKI: Update transsion symbol list
* e62dfa84 ANDROID: Export memcg functions to allow module to add new files
* c1a4113a BACKPORT: mm: userfaultfd: fix race of userfaultfd_move and swap cache
* cac44a0b ANDROID: KVM: arm64: Don't copy pvmfw pages more than once
* 6d950eb4 FROMGIT: f2fs: drop inode from the donation list when the last file is closed
* adb0ac98 ANDROID: ABI: Update the symbol list for mtk
* fe2a92df ANDROID: fix dmabuf accounting lockdep checking
* 9ec6dc68 ANDROID: fix dmabuf accounting deadlock issue
* c4165adf ANDROID: Remove additional TCP congestion configs from microdroid
* 5381fab0 ANDROID: Remove CONFIG_ETHTOOL_NETLINK from microdroid kernels
* 9ee492fe ANDROID: Remove CONFIG_INET_DIAG from microdroid kernels
* 88bce7c8 ANDROID: Remove IPV6 support from microdroid kernels
* 3ff571ab ANDROID: KVM: arm64: Set unknown bits of VBAR_EL1
* da1160c4 UPSTREAM: eventpoll: don't decrement ep refcount while still holding the ep mutex
* 0f3be428 ANDROID: Add dmabuf RSS trace event
* 62e2ce28 ANDROID: fixup dma_buf struct to avoid ABI breakage
* 4efa9734 ANDROID: fixup task_struct to avoid ABI breakage
* 86ef4842 ANDROID: Track per-process dmabuf PSS
* a7abb14b ANDROID: Track per-process dmabuf RSS HWM
* 5737a207 ANDROID: Track per-process dmabuf RSS
* 13041b54 ANDROID: add task_dma_buf_record and allocation preload facilities
* 3bef0a04 BACKPORT: Add support for PIO p flag
* cb0140ec ANDROID: KVM: arm64: fix off-by-one error in hyp_trace_find_event
* c44bb3fc ANDROID: KVM: arm64: poison/account relinquished pages after unmap
* 3bb9d12a ANDROID: Remove unneeded block and MD features
* e59ac868 ANDROID: Remove CONFIG_DM_USER from microdroid kernels

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