Merge 9467c494 ("NFSD: Never decrement pending_async_copies on error") into android14-5.15-lts
Steps on the way to 5.15.174
Merges away the nfsd changes as they break the ABI and are not relevant
for Android systems.
Resolves merge conflicts in:
fs/nfsd/nfs4proc.c
fs/nfsd/xdr4.h
Change-Id: I081acda3540e7eadc422b3de433ed16e04ffda80
Signed-off-by:
Greg Kroah-Hartman <gregkh@google.com>
Loading