Commit 1a5eed92 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 54aeb486 ("mm: reinstate ability to map write-sealed memfd mappings...


Merge 54aeb486 ("mm: reinstate ability to map write-sealed memfd mappings read-only") into android14-6.1-lts

Steps on the way to 6.1.149

Resolves merge conflicts in:
	include/linux/mm.h
	mm/mmap.c

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