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

Merge 8be3d521 ("proc: fix type confusion in pde_set_flags()") into android15-6.6-lts



Steps on the way to 6.6.107

Resolves merge conflicts in:
	include/net/sock.h

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