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

Merge branch 'android14-5.15' into branch 'android14-5.15-lts'



Catch up on many commits and abi symbols to track that have been added
to the android14-5.15 branch.

This merge contains the following commits:

* c51de219 Merge tag 'android14-5.15.131_r00' into android-14-5.15
* c0257569 ANDROID: GKI: Update symbol list for Amlogic
* 232c6ce2 ANDROID: mm: allow hooks into __alloc_pages()
* 04636bb8 ANDROID: ABI: Update oplus symbol list
* a9cb3811 ANDROID: vendor_hooks: Add hooks for binder
* 833137a6 ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate
* 42e4a441 UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP

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