5 files changed, 9 insertions, 4 deletions
diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 2c0cb18c3..7e77502c9 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -105,6 +105,9 @@ config:
  - NET_DEV_REFCNT_TRACKER: [v5.17]
  - NET_NS_REFCNT_TRACKER: [v5.17]
 
+ # Added in 5.18 to aid network debugging.
+ - DEBUG_NET: [linux-next]
+
  # This config does not add any debug checks (only debug output).
  - DEBUG_KOBJECT: n
 
diff --git a/dashboard/config/linux/bits/kmsan.yml b/dashboard/config/linux/bits/kmsan.yml
index fa299358e..38bc33a6d 100644
--- a/dashboard/config/linux/bits/kmsan.yml
+++ b/dashboard/config/linux/bits/kmsan.yml
@@ -1,9 +1,11 @@
 # 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.
 
+compiler: /usr/local/clang-kmsan/bin/clang
+
 kernel:
  repo: https://github.com/google/kmsan.git
- tag: kmsan-v5.15-rc2
+ tag: kmsan-v5.18-rc4
 
 config:
  - KMSAN
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index 04e6c7344..417fababc 100644
--- a/dashboard/config/linux/bits/linux-next.yml
+++ b/dashboard/config/linux/bits/linux-next.yml
@@ -3,4 +3,4 @@
 
 kernel:
  repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git
- tag: next-20220505
+ tag: next-20220601
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index 8d5ee35e8..25b2d0bc5 100644
--- a/dashboard/config/linux/bits/linux-upstream.yml
+++ b/dashboard/config/linux/bits/linux-upstream.yml
@@ -3,4 +3,4 @@
 
 kernel:
  repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
- tag: v5.18-rc5
+ tag: v5.18
diff --git a/dashboard/config/linux/bits/x86_64.yml b/dashboard/config/linux/bits/x86_64.yml
index 583279143..0d368fe55 100644
--- a/dashboard/config/linux/bits/x86_64.yml
+++ b/dashboard/config/linux/bits/x86_64.yml
@@ -78,7 +78,7 @@ config:
  - CPU_IDLE_GOV_HALTPOLL: [v4.16]
  - X86_INTEL_TSX_MODE_ON: [v4.16]
  - INTEL_IDLE
- - LEGACY_VSYSCALL_EMULATE
+ - LEGACY_VSYSCALL_EMULATE: [-v5.18]
  - EFI: n
 
  - TRACE_EVENT_INJECT: [v5.5]