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

Merge 7298df96 ("powerpc/vas: Return -EINVAL if the offset is non-zero in... 


Merge 7298df96 ("powerpc/vas: Return -EINVAL if the offset is non-zero in mmap()") into android14-5.15-lts

Steps on the way to 5.15.186

Resolves merge conflicts in:
	net/core/skmsg.c

Change-Id: I48704a81402ae2268917647b1490df77b7d16d9b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d126ee34 7298df96
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment