diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-08-07 10:32:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-08-07 10:32:02 +0200 |
commit | fbd320319eb47d9b585bce16d699976f1f891e8b (patch) | |
tree | 481457b8b0a6e29553d76197c9c8ae1dc0a934ba /config-generic | |
parent | aa65c667e8a7cc2a24aac0001cc98424e50efbf1 (diff) | |
parent | e9fda3244bf8a24d8413946529cc6134ca0bd802 (diff) | |
download | kernel-4.8.0-0.rc0.git7.1.vanilla.knurd.1.fc23.tar.gz kernel-4.8.0-0.rc0.git7.1.vanilla.knurd.1.fc23.tar.xz kernel-4.8.0-0.rc0.git7.1.vanilla.knurd.1.fc23.zip |
Merge remote-tracking branch 'origin/master'kernel-4.8.0-0.rc0.git7.1.vanilla.knurd.1.fc26kernel-4.8.0-0.rc0.git7.1.vanilla.knurd.1.fc25kernel-4.8.0-0.rc0.git7.1.vanilla.knurd.1.fc24kernel-4.8.0-0.rc0.git7.1.vanilla.knurd.1.fc23
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-generic b/config-generic index 005adb193..4047344f0 100644 --- a/config-generic +++ b/config-generic @@ -199,6 +199,7 @@ CONFIG_INFINIBAND_OCRDMA=m CONFIG_INFINIBAND_USNIC=m CONFIG_INFINIBAND_RDMAVT=m +CONFIG_RDMA_RXE=m # # Executable file formats @@ -4745,6 +4746,8 @@ CONFIG_NFSD_PNFS=y CONFIG_NFSD_BLOCKLAYOUT=y CONFIG_NFSD_SCSILAYOUT=y CONFIG_NFSD_V4_SECURITY_LABEL=y +# This is labeled as 'bare minimum' and 'not for production' +# CONFIG_NFSD_FLEXFILELAYOUT is not set CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_PNFS_OBJLAYOUT=m |