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

Merge ca5b4237 ("NFSD: Mark filecache "down" if init fails") into android14-5.15-lts



Steps on the way to 5.15.168

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

By just merging away this commit as it's not needed.

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