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

Merge branch 'android14-6.1' into 'android14-6.1-lts'



Catches the android14-6.1-lts branch up with the android14-6.1 branch
which has had a lot of changes that are needed here to resolve future
LTS merges and to ensure that the ABI is kept stable.

It contains the following commits:

* 0ee75a67 UPSTREAM: fs/ntfs3: Check fields while reading
* 6eb48b89 ANDROID: GKI: Update abi_gki_aarch64_qcom
* 17a080d0 ANDROID: ABI: Update pixel symbol list
* 0abc74db ANDROID: GKI: Move GKI module headers to generated includes
* 15a4b0d7 ANDROID: set kmi_symbol_list_add_only for Kleaf builds.
* dd567c60 ANDROID: GKI: Add Android ABI padding to wwan_port_ops
* 7ed895f6 ANDROID: GKI: Add Android ABI padding to wwan_ops
* 13e8071c ANDROID: update symbol list for unisoc regmap vendor hook
* ca372ba9 ANDROID: GKI: Update mtk ABI symbol list
* 8bb470d6 UPSTREAM: media: dvb-core: Fix kernel WARNING for blocking operation in wait_event*()
* 701f85c2 ANDROID: abi_gki_aarch64_qcom: Update QCOM symbol list
* d51e21b3 ANDROID: ABI: Update pixel symbol list
* 25a11995 ANDROID: GKI: add ABI symbol for xiaomi
* 7dd60ce8 ANDROID: vendor_hooks: add vendor hook to support SAGT
* f930b82d FROMLIST: fuse: revalidate: don't invalidate if interrupted
* 3a8999c6 ANDROID: GKI: Update pixel symbol list for thermal
* 6ca2ff04 ANDROID: thermal: Add vendor thermal genl check
* 62ef90de ANDROID: GKI: Update the pixel symbol list
* 7bfd71d2 ANDROID: GKI: Update protected exports
* 4a207efb FROMGIT: mm: add missing VM_FAULT_RESULT_TRACE name for VM_FAULT_COMPLETED
* 77ae3e7b FROMGIT: swap: remove remnants of polling from read_swap_cache_async

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