diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-07 18:01:15 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-07 18:01:15 +0100 |
commit | 7fb85acaeb2892e1d784882cf437a8d00ebc2b81 (patch) | |
tree | 48c215ffd856748722a74be8242fcee54cc7e2f1 /kernel-x86_64-fedora.config | |
parent | 3ac1f00ad4ce5a99b1577ce7dec202c7628f60c6 (diff) | |
parent | cfd11954f816dfd826aeae3560504cc766e52e40 (diff) | |
download | kernel-7fb85acaeb2892e1d784882cf437a8d00ebc2b81.tar.gz kernel-7fb85acaeb2892e1d784882cf437a8d00ebc2b81.tar.xz kernel-7fb85acaeb2892e1d784882cf437a8d00ebc2b81.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc7.93.vanilla.1.fc34kernel-5.10.0-0.rc7.93.vanilla.1.fc33kernel-5.10.0-0.rc7.93.vanilla.1.fc32
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 499d82d39..d7707988c 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3029,6 +3029,7 @@ CONFIG_KS0108_PORT=0x378 # CONFIG_KS8842 is not set # CONFIG_KS8851 is not set # CONFIG_KS8851_MLL is not set +# CONFIG_KCSAN is not set CONFIG_KSM=y CONFIG_KSZ884X_PCI=m # CONFIG_KUNIT is not set |