7 files changed, 25 insertions, 11 deletions
diff --git a/dashboard/config/linux/bits/chromeos-5.10.yml b/dashboard/config/linux/bits/chromeos-5.10.yml
index 2d80c6c62..45cea1938 100644
--- a/dashboard/config/linux/bits/chromeos-5.10.yml
+++ b/dashboard/config/linux/bits/chromeos-5.10.yml
@@ -4,8 +4,8 @@
 kernel:
  repo: https://chromium.googlesource.com/chromiumos/third_party/kernel
  # HEAD of chromeos-5.10 branch.
- tag: f8eeaf8c39fb2e2ab00f24cbc728de960815aa69
+ tag: ea6af77b55e49ce0cfbdd5543fe75fc8744cbd92
 
 shell:
- - chromeos/scripts/prepareconfig chromiumos-x86_64 ${BUILDDIR}/.config
+ - CHROMEOS_KERNEL_FAMILY=chromeos chromeos/scripts/prepareconfig chromiumos-x86_64-generic ${BUILDDIR}/.config
  - make olddefconfig
diff --git a/dashboard/config/linux/bits/chromeos-5.15.yml b/dashboard/config/linux/bits/chromeos-5.15.yml
index 7f7a2893c..4e9cb2ca0 100644
--- a/dashboard/config/linux/bits/chromeos-5.15.yml
+++ b/dashboard/config/linux/bits/chromeos-5.15.yml
@@ -4,8 +4,8 @@
 kernel:
  repo: https://chromium.googlesource.com/chromiumos/third_party/kernel
  # HEAD of chromeos-5.15 branch.
- tag: 7e17ed0aa6753ba346037b6aa68c7b2b8d2c4744
+ tag: e931c5c3244d7ebba8856dc6aed54a5d1a85975e
 
 shell:
- - CHROMEOS_KERNEL_FAMILY=chromeos chromeos/scripts/prepareconfig chromiumos-x86_64 ${BUILDDIR}/.config
+ - CHROMEOS_KERNEL_FAMILY=chromeos chromeos/scripts/prepareconfig chromiumos-x86_64-generic ${BUILDDIR}/.config
  - make olddefconfig
diff --git a/dashboard/config/linux/bits/chromeos-6.1.yml b/dashboard/config/linux/bits/chromeos-6.1.yml
index 37d629c77..80a08748b 100644
--- a/dashboard/config/linux/bits/chromeos-6.1.yml
+++ b/dashboard/config/linux/bits/chromeos-6.1.yml
@@ -4,10 +4,10 @@
 kernel:
  repo: https://chromium.googlesource.com/chromiumos/third_party/kernel
  # HEAD of chromeos-6.1 branch.
- tag: 648e4589ec3e42719df5ce9f27240ff22c22361d
+ tag: ebea4d55ca782539782702c2e5e86033b9f86bd2
 
 shell:
- - CHROMEOS_KERNEL_FAMILY=chromeos chromeos/scripts/prepareconfig chromiumos-x86_64 ${BUILDDIR}/.config
+ - CHROMEOS_KERNEL_FAMILY=chromeos chromeos/scripts/prepareconfig chromiumos-x86_64-generic ${BUILDDIR}/.config
  - make olddefconfig
 
 config:
diff --git a/dashboard/config/linux/bits/chromeos-6.6.yml b/dashboard/config/linux/bits/chromeos-6.6.yml
new file mode 100644
index 000000000..88ba832a4
--- /dev/null
+++ b/dashboard/config/linux/bits/chromeos-6.6.yml
@@ -0,0 +1,14 @@
+# Copyright 2024 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.
+
+kernel:
+ repo: https://chromium.googlesource.com/chromiumos/third_party/kernel
+ # HEAD of chromeos-6.6 branch.
+ tag: 3f6e68d242bb045866ae04a9f5890aacd987d2bb
+
+shell:
+ - CHROMEOS_KERNEL_FAMILY=chromeos chromeos/scripts/prepareconfig chromiumos-x86_64-generic ${BUILDDIR}/.config
+ - make olddefconfig
+
+config:
+  - IO_URING
diff --git a/dashboard/config/linux/bits/chromeos-subsystems.yml b/dashboard/config/linux/bits/chromeos-subsystems.yml
index cab9efc28..ea2c0201a 100644
--- a/dashboard/config/linux/bits/chromeos-subsystems.yml
+++ b/dashboard/config/linux/bits/chromeos-subsystems.yml
@@ -8,8 +8,8 @@
 config:
  - PKGLIST
  - PKGLIST_USE_CONFIGFS
- - ESD_FS
- - INCREMENTAL_FS: [-chromeos-5.15, -chromeos-6.1] #incrementalfs absent in 5.15
+ - ESD_FS: [-chromeos-6.6, -chromeos-6.1]
+ - INCREMENTAL_FS: [chromeos-5.10] #incrementalfs absent in 5.15+
  - VIRTIO_FS
  - VIRTIO_WL
  - USB_CONFIGFS: [override]
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index b7359a6f6..9ebca7a95 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -26,7 +26,7 @@ config:
  - DEBUG_DEVRES
  - DEBUG_MEMORY_INIT
  - DEBUG_NOTIFIERS
- - DEBUG_CREDENTIALS: [-v6.8]
+ - DEBUG_CREDENTIALS: [-v6.8, -chromeos-6.6]
  - DEBUG_TIMEKEEPING
  - DEBUG_OBJECTS
  - DEBUG_OBJECTS_ENABLE_DEFAULT: 1
diff --git a/dashboard/config/linux/bits/usb.yml b/dashboard/config/linux/bits/usb.yml
index 4b956fa1f..e8ca84685 100644
--- a/dashboard/config/linux/bits/usb.yml
+++ b/dashboard/config/linux/bits/usb.yml
@@ -6,8 +6,8 @@
 config:
  - USB_SUPPORT
  - USB_GADGET
- # It's introduced in v5.5 or so, but we want it in android-5.4, but it's not present in stable/chromeos-5.4.
- - USB_RAW_GADGET: [v5.4, -chromeos-5.4]
+ # It's introduced in v5.5 or so, but we want it in android-5.4.
+ - USB_RAW_GADGET: [v5.4]
  - USB_DUMMY_HCD
  # We don't need/test these on the USB instance.
  - USB_GADGETFS: n