From 65a841f729aecde750b7dd3ba8ebdb8edde09637 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Tue, 19 Jan 2021 13:37:31 +0100
Subject: dashboard/config/linux: update to v5.11-rc4

---
 dashboard/config/linux/bits/arm.yml            | 5 -----
 dashboard/config/linux/bits/kasan.yml          | 3 ++-
 dashboard/config/linux/bits/linux-next.yml     | 2 +-
 dashboard/config/linux/bits/linux-upstream.yml | 2 +-
 dashboard/config/linux/bits/subsystems.yml     | 4 ++--
 5 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'dashboard/config/linux/bits')

diff --git a/dashboard/config/linux/bits/arm.yml b/dashboard/config/linux/bits/arm.yml
index 0d4d9e607..9828633bc 100644
--- a/dashboard/config/linux/bits/arm.yml
+++ b/dashboard/config/linux/bits/arm.yml
@@ -1,11 +1,6 @@
 # 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.
 
-kernel:
- repo: git://git.armlinux.org.uk/~rmk/linux-arm.git
- # HEAD of for-next branch.
- tag: ecbbb88727aee7880527d4b320b4d06dde75d46d
-
 shell:
  - make vexpress_defconfig
  - make kvm_guest.config
diff --git a/dashboard/config/linux/bits/kasan.yml b/dashboard/config/linux/bits/kasan.yml
index 9f911e95a..a25a2bc7a 100644
--- a/dashboard/config/linux/bits/kasan.yml
+++ b/dashboard/config/linux/bits/kasan.yml
@@ -5,7 +5,8 @@ config:
  - KASAN
  - KASAN_GENERIC
  - KASAN_INLINE
- - KASAN_STACK_ENABLE: [clang]
+ - KASAN_STACK_ENABLE: [clang, -v5.11]
+ - KASAN_STACK: [clang, v5.11]
  - KASAN_VMALLOC: [x86_64, v5.5]
  # This was historically enabled in the KASAN section without explanation.
  - SPARSEMEM_VMEMMAP: [-arm]
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index bbb771a77..011b7963c 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-20210108
+ tag: next-20210119
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index 546bf92ad..39528cd32 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.11-rc2
+ tag: v5.11-rc4
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 724dee4ad..d5ebf1113 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -1117,8 +1117,8 @@ config:
  - INFINIBAND_USNIC: n
  - INFINIBAND_RDMAVT: n
  - INFINIBAND_OPA_VNIC: n
- - RDMA_RXE
- - RDMA_SIW
+ - RDMA_RXE: [-arm]
+ - RDMA_SIW: [-arm]
  - INFINIBAND_IPOIB
  - INFINIBAND_IPOIB_CM
  - INFINIBAND_IPOIB_DEBUG
-- 
cgit mrf-deployment