From efeff0a5c583d6c8158481970f1b0dd581358d5a Mon Sep 17 00:00:00 2001
From: Marco Elver <elver@google.com>
Date: Thu, 5 May 2022 14:42:29 +0200
Subject: dashboard/config/linux: update configs to next-20220505

Along with small changes due to changed Kconfig variables.
---
 dashboard/config/linux/bits/crypto.yml         | 3 ++-
 dashboard/config/linux/bits/linux-next.yml     | 2 +-
 dashboard/config/linux/bits/linux-upstream.yml | 2 +-
 dashboard/config/linux/bits/subsystems.yml     | 3 +++
 4 files changed, 7 insertions(+), 3 deletions(-)

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

diff --git a/dashboard/config/linux/bits/crypto.yml b/dashboard/config/linux/bits/crypto.yml
index 069d0cdd6..85c84b969 100644
--- a/dashboard/config/linux/bits/crypto.yml
+++ b/dashboard/config/linux/bits/crypto.yml
@@ -38,7 +38,8 @@ config:
  - CRYPTO_DES
  - CRYPTO_KHAZAD
  - CRYPTO_SEED
- - CRYPTO_SM4
+ - CRYPTO_SM4: [-linux-next]
+ - CRYPTO_SM4_GENERIC: [linux-next]
  - CRYPTO_TEA
  - CRYPTO_TWOFISH
  - CRYPTO_842
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index 76b141252..04e6c7344 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-20220405
+ tag: next-20220505
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index 491174b1a..8d5ee35e8 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-rc1
+ tag: v5.18-rc5
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index b9910fd4d..04ffae66b 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -272,6 +272,9 @@ config:
  - AGP_AMD64: [x86_64]
  - AGP_INTEL: [x86_64]
  - DRM
+ # Workaround: select small driver that selects DRM_DISPLAY_HELPER required by
+ # DRM_DP_AUX_CHARDEV. Only works with architectures that have CONFIG_PM.
+ - DRM_PANEL_EDP: [linux-next, -s390]
  - DRM_DP_AUX_CHARDEV
  - DRM_DEBUG_MM
  - DRM_I915: n
-- 
cgit mrf-deployment