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

Merge android13-5.15 into android13-5.15-lts



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

It contains the following commits:

* 94f34ebb Merge tag 'android13-5.15.188_r00' into android13-5.15
* 7f644406 FROMGIT: PM: runtime: fix denying of auto suspend in pm_suspend_timer_fn()
* 73935878 ANDROID: GKI: Update symbol list for Amlogic
* ce37d815 UPSTREAM: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del()
* a62b6eac UPSTREAM: mm: fix BUG splat with kvmalloc + GFP_ATOMIC
* 76baac4d UPSTREAM: mm: make slab and vmalloc allocators __GFP_NOLOCKDEP aware
* 75542d77 BACKPORT: mm: allow !GFP_KERNEL allocations for kvmalloc
* 5409baf4 BACKPORT: mm/vmalloc: be more explicit about supported gfp flags.
* be032306 BACKPORT: mm/vmalloc: add support for __GFP_NOFAIL
* eb09b506 BACKPORT: mm/vmalloc: alloc GFP_NO{FS,IO} for vmalloc
* 638e35d0 UPSTREAM: mm/vmalloc: introduce alloc_pages_bulk_array_mempolicy to accelerate memory allocation

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