Merge 9467c494 ("NFSD: Never decrement pending_async_copies on error") into android13-5.15-lts
Steps on the way to 5.15.174
Merges the nfsd changes out of the way due to abi breaks and it not
being relevant for Android systems.
Resolves merge conflicts in:
fs/nfsd/nfs4proc.c
fs/nfsd/xdr4.h
Change-Id: Idd25ae8151126ba3df4287638c5943c4865e5649
Signed-off-by:
Greg Kroah-Hartman <gregkh@google.com>
Loading
Please sign in to comment