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

Merge ed98d260 ("NFSD: Never decrement pending_async_copies on error") into android13-5.10-lts



Steps on the way to 5.10.231

Merges _AROUND_ these NFSD changes as they are not needed in Android
systems at all.

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

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