diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-19 10:38:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-19 10:38:03 -0700 |
| commit | 1ca0f935a126950c2f0b305a50f31f3b00542b0d (patch) | |
| tree | 5fc37286150906c91496371c7165de542904ec65 /fs/Kconfig | |
| parent | 0bd2f269ae892ce7283fee8fcfe2c6c971d871bc (diff) | |
| parent | a1d14d931bf700c1025db8c46d6731aa5cf440f9 (diff) | |
Merge tag 'nfsd-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fixes from Chuck Lever:
- v6.15 libcrc clean-up makes invalid configurations possible
- Fix a potential deadlock introduced during the v6.15 merge window
* tag 'nfsd-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
nfsd: decrease sc_count directly if fail to queue dl_recall
nfs: add missing selections of CONFIG_CRC32
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index c718b2e2de0e..5b4847bd2fbb 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -368,6 +368,7 @@ config GRACE_PERIOD config LOCKD tristate depends on FILE_LOCKING + select CRC32 select GRACE_PERIOD config LOCKD_V4 |