diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-06 16:42:08 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-06 16:42:08 +0100 |
commit | 5ce300c91fe724cd2f9e5ba9ec50ba676c83ec18 (patch) | |
tree | c4e839fc82aeabeaeb8d4344d4a06ea5b10a678e /kernel-i686-debug-fedora.config | |
parent | 0120fefbc532ff27cbd63d177dbb048bd3e3890e (diff) | |
parent | 2d1a677e517e1b4c5190761e06c19c65ab77eb1d (diff) | |
download | kernel-5ce300c91fe724cd2f9e5ba9ec50ba676c83ec18.tar.gz kernel-5ce300c91fe724cd2f9e5ba9ec50ba676c83ec18.tar.xz kernel-5ce300c91fe724cd2f9e5ba9ec50ba676c83ec18.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc0.git4.1.vanilla.knurd.2.fc32kernel-5.6.0-0.rc0.git4.1.vanilla.knurd.2.fc31kernel-5.6.0-0.rc0.git4.1.vanilla.knurd.2.fc30
Diffstat (limited to 'kernel-i686-debug-fedora.config')
-rw-r--r-- | kernel-i686-debug-fedora.config | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 03f8418b3..0590e07f6 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -520,11 +520,13 @@ CONFIG_BNXT_HWMON=y CONFIG_BNXT=m CONFIG_BNXT_SRIOV=y CONFIG_BONDING=m +CONFIG_BOOT_CONFIG=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_BOOTTIME_TRACING=y CONFIG_BOUNCE=y # CONFIG_BPFILTER is not set CONFIG_BPF_JIT_ALWAYS_ON=y @@ -2387,6 +2389,7 @@ CONFIG_INTEL_IOATDMA=m # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y CONFIG_INTEL_IOMMU_SVM=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IPS=m @@ -2771,6 +2774,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y # CONFIG_KMX61 is not set # CONFIG_KPC2000 is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set @@ -5802,6 +5806,7 @@ CONFIG_SYNCLINK_GT=m CONFIG_SYNCLINK=m CONFIG_SYNCLINKMP=m CONFIG_SYN_COOKIES=y +# CONFIG_SYNTH_EVENT_GEN_TEST is not set # CONFIG_SYSCON_REBOOT_MODE is not set CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set |