diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-15 19:03:10 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-15 19:03:10 +0200 |
| commit | 34935e45f6bb229743089c3f5ac15621829c844a (patch) | |
| tree | f661574a8617c0e23631cca49a012810d466255b /kernel-s390x-debug.config | |
| parent | d6fd520355f1d3a9fd806285190654fb4aed84b6 (diff) | |
| parent | ac4ad6bdf334a0200bb64532d377fb4fddd5614a (diff) | |
| download | kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc27.tar.gz kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc27.tar.xz kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc27.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc1.git0.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-s390x-debug.config')
| -rw-r--r-- | kernel-s390x-debug.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index b49f3a9b7..08d6db2be 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2197,6 +2197,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -3492,6 +3494,7 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCI_HERMES=m CONFIG_PCI_IOV=y +# CONFIG_PCI_MSI_IRQ_DOMAIN is not set CONFIG_PCI_MSI=y CONFIG_PCI_NR_FUNCTIONS=64 CONFIG_PCI_PASID=y @@ -4835,6 +4838,7 @@ CONFIG_TEST_LIST_SORT=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -4989,6 +4993,7 @@ CONFIG_UBIFS_ATIME_SUPPORT=y # CONFIG_UBIFS_FS_ADVANCED_COMPR is not set CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set # CONFIG_UBSAN_SANITIZE_ALL is not set |