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

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



This catches the android14-5.15-lts branch up with recent changes in
android14-5.15.  Changes included here are:

* 55d87477 BACKPORT: netem: fix return value if duplicate enqueue fails
* 3f3f8db2 ANDROID: GKI: Update `kernel_aarch64_16k` build config to match `kernel_aarch64`
* b15de99b UPSTREAM: binder: Use memset_page() in binder_alloc_clear_buf()
* ed28694b UPSTREAM: binder: Use kmap_local_page() in binder_alloc_copy_user_to_buffer()
* ad991276 BACKPORT: binder_alloc: Fix sleeping function called from invalid context

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