diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-09 18:13:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-09 18:13:26 +0200 |
| commit | d7a39fddf00166e25233a9899c9b12a32d01d710 (patch) | |
| tree | 208b33026fa4eefd2cabb7bb10cf6ffdad0e637a /kernel-x86_64-fedora.config | |
| parent | fea02dbd16c04b9501a97a2e2ed2eb72fb086c76 (diff) | |
| parent | 3429b90aea0dd898f9dbfa030ce6830c43a4cbce (diff) | |
| download | kernel-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-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index a2a5e4ba5..5a81c3c8b 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2585,6 +2585,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 @@ -3350,13 +3352,6 @@ CONFIG_MAILBOX=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 @@ -6798,15 +6793,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 |