diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-23 18:23:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-23 18:23:53 +0200 |
| commit | 6e2d48355e0a42d2275f8104bbd07c46f4207210 (patch) | |
| tree | a6771e6d83d849a20e7568e41af144600bee392d /kernel-x86_64-debug.config | |
| parent | 4ae1960af278a8dc36230763b64cbd34f12057ca (diff) | |
| parent | 1e2b067925a1ecbd7945c770c7e48b616ac8e4cc (diff) | |
| download | kernel-4.17.0-0.rc2.git0.1.vanilla.knurd.1.fc26.tar.gz kernel-4.17.0-0.rc2.git0.1.vanilla.knurd.1.fc26.tar.xz kernel-4.17.0-0.rc2.git0.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc2.git0.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc2.git0.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc2.git0.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc2.git0.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-x86_64-debug.config')
| -rw-r--r-- | kernel-x86_64-debug.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index de92d86ab..38583172b 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -3910,7 +3910,7 @@ CONFIG_OCFS2_FS_O2CB=m # CONFIG_OCFS2_FS_STATS is not set CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m # CONFIG_OF is not set -CONFIG_OF_PMEM=y +CONFIG_OF_PMEM=m # CONFIG_OMFS_FS is not set CONFIG_OPENVSWITCH_GENEVE=m CONFIG_OPENVSWITCH_GRE=m |