summaryrefslogtreecommitdiffstats
path: root/kernel-i686-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-09 18:13:26 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-09 18:13:26 +0200
commitd7a39fddf00166e25233a9899c9b12a32d01d710 (patch)
tree208b33026fa4eefd2cabb7bb10cf6ffdad0e637a /kernel-i686-debug-fedora.config
parentfea02dbd16c04b9501a97a2e2ed2eb72fb086c76 (diff)
parent3429b90aea0dd898f9dbfa030ce6830c43a4cbce (diff)
downloadkernel-d7a39fddf00166e25233a9899c9b12a32d01d710.tar.gz
kernel-d7a39fddf00166e25233a9899c9b12a32d01d710.tar.xz
kernel-d7a39fddf00166e25233a9899c9b12a32d01d710.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc5.20210608git368094df48e6.39.vanilla.1.fc34
Diffstat (limited to 'kernel-i686-debug-fedora.config')
-rw-r--r--kernel-i686-debug-fedora.config18
1 files changed, 2 insertions, 16 deletions
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 173af3c68..f6119d02d 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -2556,6 +2556,8 @@ CONFIG_INFINIBAND_VMWARE_PVRDMA=m
CONFIG_INITRAMFS_COMPRESSION_NONE=y
# CONFIG_INITRAMFS_COMPRESSION_XZ is not set
CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_INIT_STACK_ALL_PATTERN is not set
+# CONFIG_INIT_STACK_ALL_ZERO is not set
CONFIG_INIT_STACK_NONE=y
CONFIG_INOTIFY_USER=y
# CONFIG_INPUT_AD714X is not set
@@ -3323,13 +3325,6 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_MANAGER_SBS is not set
# CONFIG_MANDATORY_FILE_LOCKING is not set
CONFIG_MANTIS_CORE=m
-# CONFIG_MARCH_Z10 is not set
-# CONFIG_MARCH_Z13 is not set
-# CONFIG_MARCH_Z14 is not set
-# CONFIG_MARCH_Z196 is not set
-# CONFIG_MARCH_Z900 is not set
-# CONFIG_MARCH_Z9_109 is not set
-# CONFIG_MARCH_Z990 is not set
CONFIG_MARVELL_10G_PHY=m
# CONFIG_MARVELL_88X2222_PHY is not set
CONFIG_MARVELL_PHY=m
@@ -6769,15 +6764,6 @@ CONFIG_TULIP=m
CONFIG_TULIP_MMIO=y
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_NAPI is not set
-CONFIG_TUNE_DEFAULT=y
-# CONFIG_TUNE_Z10 is not set
-# CONFIG_TUNE_Z13 is not set
-# CONFIG_TUNE_Z14 is not set
-# CONFIG_TUNE_Z196 is not set
-# CONFIG_TUNE_Z900 is not set
-# CONFIG_TUNE_Z9_109 is not set
-# CONFIG_TUNE_Z990 is not set
-# CONFIG_TUNE_ZEC12 is not set
CONFIG_TUN=m
# CONFIG_TUN_VNET_CROSS_LE is not set
# CONFIG_TWL4030_CORE is not set