These two are backports for 6.1.y. Conflict resolution in done in both patches. I have tested LTP-nfs fchown02 and chown02 on 6.1.y with below patches applied. The tests passed. I would like to have a review as I am not familiar with this code. Thanks to Vegard for helping me with this. Thanks, Harshit Christian Brauner (2): nfs: use vfs setgid helper nfsd: use vfs setgid helper fs/attr.c | 1 + fs/internal.h | 2 -- fs/nfs/inode.c | 4 +--- fs/nfsd/vfs.c | 4 +++- include/linux/fs.h | 2 ++ 5 files changed, 7 insertions(+), 6 deletions(-) -- 2.34.1