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

Merge 952596b0 ("mm/hugetlb: fix huge_pmd_unshare() vs GUP-fast race") into android13-5.10-lts 



Steps on the way to 5.10.239

Resolves merge conflicts in:
	mm/hugetlb.c

Change-Id: I6640a15a72b4d307bd4e65c46d7cba9c6510cf4a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents a3267adb 952596b0
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