Commit 78db83bb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3feac2b5 ("sunrpc: exclude from freezer when waiting for requests:")...


Merge 3feac2b5 ("sunrpc: exclude from freezer when waiting for requests:") into android14-5.15-lts

Steps on the way to 5.15.161

Resolves merge conflicts in:
	fs/nfsd/nfs4proc.c

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