dashboard/config/linux: fix ChromeOS full/baseline configs

ESD_FS/INCREMENTAL_FS were supposed to be enabled in full config only,
but they were enabled only in baseline config.

Split chromeos.yml to chromeos.yml and chromeos-subsystems.yml
to avoid this mistake in future and the need to write [-baseline].

Also enabled UBS_CONFIG_FS as it seems to be enabled on real devices.

Do the same for Android.

21 files changed, 194 insertions, 34 deletions

diff --git a/dashboard/config/linux/android-5.4.config b/dashboard/config/linux/android-5.4.config
index 0529a1dde..35ff4a0e8 100644
--- a/dashboard/config/linux/android-5.4.config
+++ b/dashboard/config/linux/android-5.4.config
@@ -4686,6 +4686,7 @@ CONFIG_USB_GADGET_DEBUG_FILES=y
 CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_USB_GADGET_VBUS_DRAW=500
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4708,7 +4709,52 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_DUMMY_HCD=y
 # end of USB Peripheral Controller
 
-# CONFIG_USB_CONFIGFS is not set
+CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_F_SS_LB=y
+CONFIG_USB_U_SERIAL=y
+CONFIG_USB_U_ETHER=y
+CONFIG_USB_U_AUDIO=y
+CONFIG_USB_F_SERIAL=y
+CONFIG_USB_F_OBEX=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_EEM=y
+CONFIG_USB_F_SUBSET=y
+CONFIG_USB_F_RNDIS=y
+CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_FS=y
+CONFIG_USB_F_UAC1=y
+CONFIG_USB_F_UAC1_LEGACY=y
+CONFIG_USB_F_UAC2=y
+CONFIG_USB_F_UVC=y
+CONFIG_USB_F_MIDI=y
+CONFIG_USB_F_HID=y
+CONFIG_USB_F_PRINTER=y
+CONFIG_USB_F_ACC=y
+CONFIG_USB_F_AUDIO_SRC=y
+CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
 CONFIG_TYPEC=y
 CONFIG_TYPEC_TCPM=y
 # CONFIG_TYPEC_TCPCI is not set
diff --git a/dashboard/config/linux/bits/android-5.4.yml b/dashboard/config/linux/bits/android-5.4.yml
index 550cba5c7..a976bb5c8 100644
--- a/dashboard/config/linux/bits/android-5.4.yml
+++ b/dashboard/config/linux/bits/android-5.4.yml
@@ -10,9 +10,3 @@ kernel:
 
 shell:
  - make gki_defconfig
-
-config:
- # gki_defconfig defaults to KERNEL_LZ4, but we don't have lz4 installed,
- # and the package lz4 is not available on the syzbot distros.
- - KERNEL_GZIP
- - INCREMENTAL_FS: [baseline]
diff --git a/dashboard/config/linux/bits/android-subsystems.yml b/dashboard/config/linux/bits/android-subsystems.yml
new file mode 100644
index 000000000..c716cb80a
--- /dev/null
+++ b/dashboard/config/linux/bits/android-subsystems.yml
@@ -0,0 +1,31 @@
+# Copyright 2020 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+# Enabled on full (non-basefile) Android kernels.
+# These configs are not enabled by gki_defconfig, but have lots of backports,
+# or completely ChromeOS-specific, or enabled on real devices.
+
+config:
+ - INCREMENTAL_FS
+ - USB_CONFIGFS: [override]
+ - USB_CONFIGFS_UEVENT
+ - USB_CONFIGFS_SERIAL
+ - USB_CONFIGFS_ACM
+ - USB_CONFIGFS_OBEX
+ - USB_CONFIGFS_NCM
+ - USB_CONFIGFS_ECM
+ - USB_CONFIGFS_ECM_SUBSET
+ - USB_CONFIGFS_RNDIS
+ - USB_CONFIGFS_EEM
+ - USB_CONFIGFS_MASS_STORAGE
+ - USB_CONFIGFS_F_LB_SS
+ - USB_CONFIGFS_F_FS
+ - USB_CONFIGFS_F_ACC
+ - USB_CONFIGFS_F_AUDIO_SRC
+ - USB_CONFIGFS_F_UAC1
+ - USB_CONFIGFS_F_UAC1_LEGACY
+ - USB_CONFIGFS_F_UAC2
+ - USB_CONFIGFS_F_MIDI
+ - USB_CONFIGFS_F_HID
+ - USB_CONFIGFS_F_UVC
+ - USB_CONFIGFS_F_PRINTER
diff --git a/dashboard/config/linux/bits/android.yml b/dashboard/config/linux/bits/android.yml
new file mode 100644
index 000000000..f93d782ed
--- /dev/null
+++ b/dashboard/config/linux/bits/android.yml
@@ -0,0 +1,9 @@
+# Copyright 2020 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+# Enabled on all Android kernels.
+
+config:
+ # gki_defconfig defaults to KERNEL_LZ4, but we don't have lz4 installed,
+ # and the package lz4 is not available on the syzbot distros.
+ - KERNEL_GZIP
diff --git a/dashboard/config/linux/bits/chromeos-subsystems.yml b/dashboard/config/linux/bits/chromeos-subsystems.yml
new file mode 100644
index 000000000..7d83b7bcc
--- /dev/null
+++ b/dashboard/config/linux/bits/chromeos-subsystems.yml
@@ -0,0 +1,36 @@
+# Copyright 2020 syzkaller project authors. All rights reserved.
+# Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
+
+# Enabled on full (non-basefile) ChromeOS kernels.
+# These configs are not enabled by prepareconfig, but have lots of backports,
+# or completely ChromeOS-specific, or enabled on real devices.
+
+config:
+ - PKGLIST
+ - PKGLIST_USE_CONFIGFS
+ - ESD_FS
+ - INCREMENTAL_FS
+ - VIRTIO_FS
+ - VIRTIO_WL
+ - USB_CONFIGFS: [override]
+ - USB_CONFIGFS_UEVENT
+ - USB_CONFIGFS_SERIAL
+ - USB_CONFIGFS_ACM
+ - USB_CONFIGFS_OBEX
+ - USB_CONFIGFS_NCM
+ - USB_CONFIGFS_ECM
+ - USB_CONFIGFS_ECM_SUBSET
+ - USB_CONFIGFS_RNDIS
+ - USB_CONFIGFS_EEM
+ - USB_CONFIGFS_MASS_STORAGE
+ - USB_CONFIGFS_F_LB_SS
+ - USB_CONFIGFS_F_FS
+ - USB_CONFIGFS_F_ACC
+ - USB_CONFIGFS_F_AUDIO_SRC
+ - USB_CONFIGFS_F_UAC1
+ - USB_CONFIGFS_F_UAC1_LEGACY
+ - USB_CONFIGFS_F_UAC2
+ - USB_CONFIGFS_F_MIDI
+ - USB_CONFIGFS_F_HID
+ - USB_CONFIGFS_F_UVC
+ - USB_CONFIGFS_F_PRINTER
diff --git a/dashboard/config/linux/bits/chromeos.yml b/dashboard/config/linux/bits/chromeos.yml
index db5603ab8..08058a145 100644
--- a/dashboard/config/linux/bits/chromeos.yml
+++ b/dashboard/config/linux/bits/chromeos.yml
@@ -1,15 +1,10 @@
 # Copyright 2020 syzkaller project authors. All rights reserved.
 # Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
 
+# Enabled on all ChromeOS kernels.
+
 config:
  # Otherwise kernel does not permit tmpfs mounts that we do during executor setup.
  - SECURITY_CHROMIUMOS_NO_UNPRIVILEGED_UNSAFE_MOUNTS: n
  # These were used historically, their origins are lost.
  - CMDLINE: [append, "noresume noswap dm_verity.error_behavior=3 dm_verity.max_bios=-1 dm_verity.dev_wait=1 i915.modeset=1 cros_efi"]
- # These are not enabled in prepareconfig, but have lots of backports or completely ChromeOS-specific.
- - PKGLIST: [baseline]
- - PKGLIST_USE_CONFIGFS: [baseline]
- - ESD_FS: [baseline]
- - INCREMENTAL_FS: [baseline]
- - VIRTIO_FS: [baseline]
- - VIRTIO_WL: [baseline]
diff --git a/dashboard/config/linux/chromeos-5.4-base.config b/dashboard/config/linux/chromeos-5.4-base.config
index c49c8ebd0..fd3ec139a 100644
--- a/dashboard/config/linux/chromeos-5.4-base.config
+++ b/dashboard/config/linux/chromeos-5.4-base.config
@@ -4965,7 +4965,7 @@ CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_INPUT=y
 # CONFIG_VIRTIO_MMIO is not set
 CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
-CONFIG_VIRTIO_WL=y
+# CONFIG_VIRTIO_WL is not set
 
 #
 # Microsoft Hyper-V guest support
@@ -5819,9 +5819,9 @@ CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
-CONFIG_VIRTIO_FS=y
+# CONFIG_VIRTIO_FS is not set
 # CONFIG_OVERLAY_FS is not set
-CONFIG_INCREMENTAL_FS=y
+# CONFIG_INCREMENTAL_FS is not set
 
 #
 # Caches
@@ -6343,7 +6343,6 @@ CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_XZ=y
-CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_ENC8=y
diff --git a/dashboard/config/linux/chromeos-5.4.config b/dashboard/config/linux/chromeos-5.4.config
index e83c6aef0..7e7602cd6 100644
--- a/dashboard/config/linux/chromeos-5.4.config
+++ b/dashboard/config/linux/chromeos-5.4.config
@@ -4808,6 +4808,7 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_U_SERIAL_CONSOLE is not set
 
 #
 # USB Peripheral Controller
@@ -4830,7 +4831,52 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 CONFIG_USB_DUMMY_HCD=y
 # end of USB Peripheral Controller
 
-# CONFIG_USB_CONFIGFS is not set
+CONFIG_USB_LIBCOMPOSITE=y
+CONFIG_USB_F_ACM=y
+CONFIG_USB_F_SS_LB=y
+CONFIG_USB_U_SERIAL=y
+CONFIG_USB_U_ETHER=y
+CONFIG_USB_U_AUDIO=y
+CONFIG_USB_F_SERIAL=y
+CONFIG_USB_F_OBEX=y
+CONFIG_USB_F_NCM=y
+CONFIG_USB_F_ECM=y
+CONFIG_USB_F_EEM=y
+CONFIG_USB_F_SUBSET=y
+CONFIG_USB_F_RNDIS=y
+CONFIG_USB_F_MASS_STORAGE=y
+CONFIG_USB_F_FS=y
+CONFIG_USB_F_UAC1=y
+CONFIG_USB_F_UAC1_LEGACY=y
+CONFIG_USB_F_UAC2=y
+CONFIG_USB_F_UVC=y
+CONFIG_USB_F_MIDI=y
+CONFIG_USB_F_HID=y
+CONFIG_USB_F_PRINTER=y
+CONFIG_USB_F_ACC=y
+CONFIG_USB_F_AUDIO_SRC=y
+CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_UEVENT=y
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
 CONFIG_TYPEC=y
 # CONFIG_TYPEC_TCPM is not set
 CONFIG_TYPEC_UCSI=y
@@ -5121,7 +5167,7 @@ CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_INPUT=y
 # CONFIG_VIRTIO_MMIO is not set
 CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
-# CONFIG_VIRTIO_WL is not set
+CONFIG_VIRTIO_WL=y
 
 #
 # Microsoft Hyper-V guest support
@@ -6010,9 +6056,9 @@ CONFIG_QUOTACTL_COMPAT=y
 # CONFIG_AUTOFS_FS is not set
 CONFIG_FUSE_FS=y
 # CONFIG_CUSE is not set
-# CONFIG_VIRTIO_FS is not set
+CONFIG_VIRTIO_FS=y
 # CONFIG_OVERLAY_FS is not set
-# CONFIG_INCREMENTAL_FS is not set
+CONFIG_INCREMENTAL_FS=y
 
 #
 # Caches
@@ -6535,6 +6581,7 @@ CONFIG_XZ_DEC_BCJ=y
 # CONFIG_XZ_DEC_TEST is not set
 CONFIG_DECOMPRESS_GZIP=y
 CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZ4=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=y
 CONFIG_REED_SOLOMON_ENC8=y
diff --git a/dashboard/config/linux/main.yml b/dashboard/config/linux/main.yml
index aafd7f1c0..0bbf8ef5f 100644
--- a/dashboard/config/linux/main.yml
+++ b/dashboard/config/linux/main.yml
@@ -36,4 +36,7 @@ includes:
  - kcsan.yml: [kcsan]
  - kmsan.yml: [kmsan]
  - kfence.yml: [kfence]
+ - android.yml: [android]
+ - android-subsystems.yml: [android, -baseline]
  - chromeos.yml: [chromeos]
+ - chromeos-subsystems.yml: [chromeos, -baseline]
diff --git a/dashboard/config/linux/stable-5.4-kasan-base.config b/dashboard/config/linux/stable-5.4-kasan-base.config
index 176c8de4b..700f8409d 100644
--- a/dashboard/config/linux/stable-5.4-kasan-base.config
+++ b/dashboard/config/linux/stable-5.4-kasan-base.config
@@ -7,7 +7,7 @@
 #
 
 #
-# Compiler: gcc (Debian 10.2.0-9) 10.2.0
+# Compiler: gcc (Debian 10.2.0-15) 10.2.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
diff --git a/dashboard/config/linux/stable-5.4-kasan.config b/dashboard/config/linux/stable-5.4-kasan.config
index f93154d47..cdd48d726 100644
--- a/dashboard/config/linux/stable-5.4-kasan.config
+++ b/dashboard/config/linux/stable-5.4-kasan.config
@@ -7,7 +7,7 @@
 #
 
 #
-# Compiler: gcc (Debian 10.2.0-9) 10.2.0
+# Compiler: gcc (Debian 10.2.0-15) 10.2.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
diff --git a/dashboard/config/linux/upstream-apparmor-kasan-base.config b/dashboard/config/linux/upstream-apparmor-kasan-base.config
index e69ffb4f9..a18ce8894 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan-base.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan-base.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-apparmor-kasan.config b/dashboard/config/linux/upstream-apparmor-kasan.config
index f84a2e774..5727b9d4a 100644
--- a/dashboard/config/linux/upstream-apparmor-kasan.config
+++ b/dashboard/config/linux/upstream-apparmor-kasan.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-leak-base.config b/dashboard/config/linux/upstream-leak-base.config
index ed7c9e6ca..0e71c2f5e 100644
--- a/dashboard/config/linux/upstream-leak-base.config
+++ b/dashboard/config/linux/upstream-leak-base.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config
index 7c8ed5270..4bca4261b 100644
--- a/dashboard/config/linux/upstream-leak.config
+++ b/dashboard/config/linux/upstream-leak.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-selinux-kasan-base.config b/dashboard/config/linux/upstream-selinux-kasan-base.config
index 9b646fe9b..bb31ca0d6 100644
--- a/dashboard/config/linux/upstream-selinux-kasan-base.config
+++ b/dashboard/config/linux/upstream-selinux-kasan-base.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-selinux-kasan.config b/dashboard/config/linux/upstream-selinux-kasan.config
index beba515c6..062ebff64 100644
--- a/dashboard/config/linux/upstream-selinux-kasan.config
+++ b/dashboard/config/linux/upstream-selinux-kasan.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-smack-kasan-base.config b/dashboard/config/linux/upstream-smack-kasan-base.config
index 9f5c7ea36..27590b0f9 100644
--- a/dashboard/config/linux/upstream-smack-kasan-base.config
+++ b/dashboard/config/linux/upstream-smack-kasan-base.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-smack-kasan.config b/dashboard/config/linux/upstream-smack-kasan.config
index 8b6fd439b..906b4ab6e 100644
--- a/dashboard/config/linux/upstream-smack-kasan.config
+++ b/dashboard/config/linux/upstream-smack-kasan.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc5 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-usb-base.config b/dashboard/config/linux/upstream-usb-base.config
index 37f89797c..344dd5713 100644
--- a/dashboard/config/linux/upstream-usb-base.config
+++ b/dashboard/config/linux/upstream-usb-base.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000
diff --git a/dashboard/config/linux/upstream-usb.config b/dashboard/config/linux/upstream-usb.config
index 1e50638c1..09b5c7ab5 100644
--- a/dashboard/config/linux/upstream-usb.config
+++ b/dashboard/config/linux/upstream-usb.config
@@ -5,7 +5,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86_64 5.10.0-rc1 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-9) 10.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.0-15) 10.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=100200
 CONFIG_LD_VERSION=235010000