diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-21 14:48:38 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-21 14:48:38 -0700 |
commit | a2eaf246f5732519f3dcc34e18fd41909e226284 (patch) | |
tree | d8d3e98dac017bec6e43a09134bdb7739d566ac5 /fs/nfs | |
parent | 2faac9a98f010cf5b342fa89ac489c4586364e6e (diff) | |
parent | 27c934dd8832dd40fd34776f916dc201e18b319b (diff) | |
download | linux-a2eaf246f5732519f3dcc34e18fd41909e226284.tar.gz linux-a2eaf246f5732519f3dcc34e18fd41909e226284.tar.bz2 linux-a2eaf246f5732519f3dcc34e18fd41909e226284.zip |
Merge tag 'nfsd-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- Fix a crash during NFS READs from certain client implementations
- Address a minor kbuild regression in v6.3
* tag 'nfsd-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
nfsd: don't replace page in rq_pages if it's a continuation of last page
NFS & NFSD: Update GSS dependencies
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index 14a72224b657..450d6c3bc05e 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -75,7 +75,7 @@ config NFS_V3_ACL config NFS_V4 tristate "NFS client support for NFS version 4" depends on NFS_FS - select SUNRPC_GSS + select RPCSEC_GSS_KRB5 select KEYS help This option enables support for version 4 of the NFS protocol |