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

Merge f7a3090b ("nfsd: hold a lighter-weight client reference over...


Merge f7a3090b ("nfsd: hold a lighter-weight client reference over CB_RECALL_ANY") into android14-5.15-lts

Steps on the way to 5.15.154

Resolves merge conflicts in:
	fs/nfsd/nfs4state.c
by merging away commit f7a3090b ("nfsd: hold a lighter-weight client
reference over CB_RECALL_ANY") into android14-5.15-lts as the other nfs
patches were also removed earlier in the merge cycle.

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