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:Greg Kroah-Hartman <gregkh@google.com>
Loading