diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-20 10:04:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-20 10:04:07 +0200 |
| commit | b830a70fa8f6711f29d0448994ec015e10a65b87 (patch) | |
| tree | a7de7949c17dee5473a88882ffb9446f29615635 /kernel-i686-debug.config | |
| parent | b25077fc7e1ee780d247a24a62bb844289ccccc1 (diff) | |
| parent | 59566d9a2cbf6092cd9f7b0990f073c81ce668d3 (diff) | |
| download | kernel-4.14.0-0.rc5.git3.1.vanilla.knurd.1.fc26.tar.gz kernel-4.14.0-0.rc5.git3.1.vanilla.knurd.1.fc26.tar.xz kernel-4.14.0-0.rc5.git3.1.vanilla.knurd.1.fc26.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc5.git3.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc5.git3.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-i686-debug.config')
| -rw-r--r-- | kernel-i686-debug.config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 6eb455f49..feba8af30 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -197,6 +197,7 @@ CONFIG_ALI_FIR=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m # CONFIG_ALIX is not set +CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m CONFIG_ALTERA_STAPL=m @@ -2228,7 +2229,7 @@ CONFIG_IP_DCCP_CCID2=m # CONFIG_IP_DCCP_CCID3_DEBUG is not set CONFIG_IP_DCCP_CCID3=y # CONFIG_IP_DCCP_DEBUG is not set -CONFIG_IP_DCCP=m +# CONFIG_IP_DCCP is not set CONFIG_IPDDP_ENCAP=y CONFIG_IPDDP=m CONFIG_IP_FIB_TRIE_STATS=y @@ -2705,6 +2706,7 @@ CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKD=m +# CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set CONFIG_LOCK_DOWN_KERNEL=y CONFIG_LOCKD_V4=y CONFIG_LOCK_STAT=y |