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

Merge ccd9fe71 ("nfsd: Fix a regression in nfsd_setattr()") into android14-5.15-lts 



Steps on the way to 5.15.154

Resolves merge conflicts in:
	include/linux/fs.h

Change-Id: Icac6a1c70763c1d29421b2e80890d45d23630d39
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 34e0f767 ccd9fe71
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment