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-armv7hl-lpae-debug.config | |
| parent | b25077fc7e1ee780d247a24a62bb844289ccccc1 (diff) | |
| parent | 59566d9a2cbf6092cd9f7b0990f073c81ce668d3 (diff) | |
| download | kernel-b830a70fa8f6711f29d0448994ec015e10a65b87.tar.gz kernel-b830a70fa8f6711f29d0448994ec015e10a65b87.tar.xz kernel-b830a70fa8f6711f29d0448994ec015e10a65b87.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-armv7hl-lpae-debug.config')
| -rw-r--r-- | kernel-armv7hl-lpae-debug.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 40a6ab085..f929ab7e1 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -154,6 +154,7 @@ CONFIG_AK8975=m CONFIG_ALI_FIR=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m +CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y # CONFIG_ALTERA_MBOX is not set CONFIG_ALTERA_MSGDMA=m CONFIG_ALTERA_STAPL=m @@ -2832,6 +2833,7 @@ CONFIG_LMP91000=m 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 is not set CONFIG_LOCKD_V4=y # CONFIG_LOCK_STAT is not set |