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

Merge 6847b3e4 ("powerpc/code-patching: Fix KASAN hit by not flagging text...


Merge 6847b3e4 ("powerpc/code-patching: Fix KASAN hit by not flagging text patching area as VM_ALLOC") into android14-5.15-lts

Steps on the way to 5.15.179

Resolves merge conflicts in:
	fs/f2fs/file.c
	mm/oom_kill.c

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