diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2015-06-10 12:44:58 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2015-06-10 12:45:09 +0200 |
| commit | 206c59d1d7d42bcafc1d7f1e476e87e4427e2345 (patch) | |
| tree | a2f99470bd0fe43f5cf57812fca969bb3ca3c451 /fs/nfsd/Kconfig | |
| parent | mac80211: Fix a case of incorrect metric used when forwarding a PREQ (diff) | |
| parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
| download | linux-206c59d1d7d42bcafc1d7f1e476e87e4427e2345.tar.xz linux-206c59d1d7d42bcafc1d7f1e476e87e4427e2345.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge back net-next to get wireless driver changes (from Kalle)
to be able to create the API change across all trees properly.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'fs/nfsd/Kconfig')
| -rw-r--r-- | fs/nfsd/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig index fc2d108f5272..a0b77fc1bd39 100644 --- a/fs/nfsd/Kconfig +++ b/fs/nfsd/Kconfig @@ -108,7 +108,7 @@ config NFSD_V4_SECURITY_LABEL config NFSD_FAULT_INJECTION bool "NFS server manual fault injection" - depends on NFSD_V4 && DEBUG_KERNEL + depends on NFSD_V4 && DEBUG_KERNEL && DEBUG_FS help This option enables support for manually injecting faults into the NFS server. This is intended to be used for |