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

Merge 2f8f226f ("NFSD: Fix NFSv4's PUTPUBFH operation") into android14-5.15-lts



Steps on the way to 5.15.168

Resolves merge conflicts in:
	fs/nfsd/nfs4xdr.c
	fs/nfsd/vfs.c

for now, real solution is to merge-around these commits due to the large
divergance in our tree.  That will be in the next commit in this
series...

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