From 86b4b7f81837a5f26db1e1e2cbbefc7c3885fb08 Mon Sep 17 00:00:00 2001
From: Taras Madan <tarasmadan@google.com>
Date: Wed, 6 Apr 2022 10:44:47 +0200
Subject: dashboard/config/linux: update linux configs to v5.18-rc1

update linux to v5.18-rc1
fix dependency update errors
update configs
---
 dashboard/config/linux/bits/base.yml           |  2 ++
 dashboard/config/linux/bits/linux-next.yml     |  2 +-
 dashboard/config/linux/bits/linux-upstream.yml |  2 +-
 dashboard/config/linux/bits/riscv64.yml        |  3 ++-
 dashboard/config/linux/bits/subsystems.yml     | 15 ++++++++++-----
 dashboard/config/linux/bits/x86_64.yml         |  4 +++-
 6 files changed, 19 insertions(+), 9 deletions(-)

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

diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 1b70ffc06..707f51545 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -106,6 +106,8 @@ config:
  - DEBUG_KOBJECT: n
 
  - DEBUG_INFO
+ # One of DEBUG_INFO_DWARF_* is required to enable DEBUG_INFO in v5.18.
+ - DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT: [v5.18]
  # CONFIG_DEBUG_INFO_BTF breaks the build since 5.14 merge window:
  #    https://lkml.kernel.org/r/YOLzFecogWmdZ5Hc@infradead.org
  - DEBUG_INFO_BTF: [-v5.13]
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index bc9569340..76b141252 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-20220222
+ tag: next-20220405
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index 676e06016..491174b1a 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.17-rc1
+ tag: v5.18-rc1
diff --git a/dashboard/config/linux/bits/riscv64.yml b/dashboard/config/linux/bits/riscv64.yml
index 361ebdbf6..321bb2407 100644
--- a/dashboard/config/linux/bits/riscv64.yml
+++ b/dashboard/config/linux/bits/riscv64.yml
@@ -14,4 +14,5 @@ config:
 
  # Presumably this gives more interesting coverage.
  - BINFMT_FLAT
- - RISCV_BASE_PMU: [-baseline]
+ # This perf implementation was removed by https://lkml.org/lkml/2022/4/1/1109 (v5.18)
+ - RISCV_BASE_PMU: [-baseline, -v5.18]
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 260852e16..b9910fd4d 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -125,7 +125,8 @@ config:
  - MTD_BLOCK2MTD
  - MTD_UBI
  - BLK_DEV_PMEM: [x86_64]
- - ND_BLK: [x86_64]
+ # ND_BLK removed from v5.18 by f8669f1d6a86
+ - ND_BLK: [x86_64, -v5.18]
  - ND_CLAIM: [x86_64]
  - ND_BTT: [x86_64]
  - BTT: [x86_64]
@@ -425,7 +426,8 @@ config:
  - VHOST_CROSS_ENDIAN_LEGACY
  - STAGING
  - ANDROID
- - ASHMEM
+ # ASHMEM removed from v5.18. Replacement is memfd.
+ - ASHMEM: [-v5.18]
  - ION: [-v5.10]
  - ION_SYSTEM_HEAP: [-v5.10]
  - ION_CMA_HEAP: [-v5.10]
@@ -449,7 +451,8 @@ config:
  - PSTORE_ZSTD_COMPRESS
  - PSTORE_COMPRESS
  - PSTORE_DEFLATE_COMPRESS_DEFAULT
- - FS_DAX: [-arm]
+ # Didn't find how to enable it for riscv in v5.18
+ - FS_DAX: [-arm, -riscv]
  - FS_ENCRYPTION
  - FS_VERITY
  - FS_VERITY_BUILTIN_SIGNATURES
@@ -532,9 +535,11 @@ config:
  - BIG_KEYS: [-kmsan]
  - TRUSTED_KEYS
  - KEY_DH_OPERATIONS
- - ASYMMETRIC_TPM_KEY_SUBTYPE
+ # ASYMMETRIC_TPM_KEY_SUBTYPE removed since v5.18, refer https://lore.kernel.org/lkml/YiL4DJscHPEsDHc3@iki.fi/T/
+ - ASYMMETRIC_TPM_KEY_SUBTYPE: [-v5.18]
  - PKCS8_PRIVATE_KEY_PARSER
- - TPM_KEY_PARSER
+ # TPM_KEY_PARSER removed since v5.18, refer https://lore.kernel.org/lkml/YiL4DJscHPEsDHc3@iki.fi/T/
+ - TPM_KEY_PARSER: [-v5.18]
  - PKCS7_TEST_KEY
  - SIGNED_PE_FILE_VERIFICATION
  - SECONDARY_TRUSTED_KEYRING
diff --git a/dashboard/config/linux/bits/x86_64.yml b/dashboard/config/linux/bits/x86_64.yml
index 399f97e27..b0391e5d8 100644
--- a/dashboard/config/linux/bits/x86_64.yml
+++ b/dashboard/config/linux/bits/x86_64.yml
@@ -45,7 +45,9 @@ config:
 
  # 32-on-64 support (compat).
  - IA32_EMULATION
- - X86_X32: [-baseline]
+ # X86_X32 renamed to X86_X32_ABI in v5.18
+ - X86_X32: [-baseline, -v5.18]
+ - X86_X32_ABI: [-baseline, v5.18]
 
  # Moved from legacy config, reason for enabling is unknown.
  - KALLSYMS_ABSOLUTE_PERCPU
-- 
cgit mrf-deployment