dashboard/config/linux: update to latest kernels

6 files changed, 17 insertions, 15 deletions

diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 1a6996a34..7fee06569 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -139,7 +139,8 @@ config:
  - PRINTK_TIME
  # Some kernel oops'es are large. Largest observed for a stack overflow is ~42KB.
  # There are 2 such buffers per CPU (safe and nmi), so this adds 128KB per CPU.
- - PRINTK_SAFE_LOG_BUF_SHIFT: 16
+ # The config was removed in "Remove orphaned CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT".
+ - PRINTK_SAFE_LOG_BUF_SHIFT: [16, -linux-next]
 
  # Fault injection.
  - FAULT_INJECTION
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index 0406425fc..b3b7e54d1 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-20230215
+ tag: next-20230331
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index b30204c66..3fb63b910 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: v6.2-rc8
+ tag: v6.3-rc4
diff --git a/dashboard/config/linux/bits/net-extra.yml b/dashboard/config/linux/bits/net-extra.yml
index 8fcaa5f32..39ef8f239 100644
--- a/dashboard/config/linux/bits/net-extra.yml
+++ b/dashboard/config/linux/bits/net-extra.yml
@@ -156,7 +156,7 @@ config:
  - ATM_LANE
  - ATM_MPOA
  - ATM_BR2684
- - NET_SCH_ATM
+ - NET_SCH_ATM: [-v6.3]
  - ATM_TCP
  - USB_ATM
 
diff --git a/dashboard/config/linux/bits/net.yml b/dashboard/config/linux/bits/net.yml
index 3f87259e8..6d8b5f555 100644
--- a/dashboard/config/linux/bits/net.yml
+++ b/dashboard/config/linux/bits/net.yml
@@ -98,6 +98,8 @@ config:
  - NETFILTER
  - NETFILTER_INGRESS
  - NETFILTER_ADVANCED
+ - NETFILTER_XTABLES
+ - NETFILTER_XTABLES_COMPAT: [v5.15, -arm]
  - NF_CONNTRACK
  - NF_LOG_NETDEV: [-v5.13]
  - NETWORK_SECMARK
@@ -232,8 +234,7 @@ config:
  - IP_NF_TARGET_NETMAP
  - IP_NF_TARGET_REDIRECT
  - IP_NF_MANGLE
- # IP_NF_TARGET_CLUSTERIP is removed as of next-20230124.
- - IP_NF_TARGET_CLUSTERIP: [-linux-next]
+ - IP_NF_TARGET_CLUSTERIP: [-v6.3]
  - IP_NF_TARGET_ECN
  - IP_NF_TARGET_TTL
  - IP_NF_RAW
@@ -284,7 +285,7 @@ config:
  - VLAN_8021Q_MVRP
  - LLC2
  - NET_SCHED
- - NET_SCH_CBQ
+ - NET_SCH_CBQ: [-v6.3]
  - NET_SCH_HTB
  - NET_SCH_HFSC
  - NET_SCH_PRIO
@@ -298,7 +299,7 @@ config:
  - NET_SCH_ETF
  - NET_SCH_TAPRIO
  - NET_SCH_GRED
- - NET_SCH_DSMARK
+ - NET_SCH_DSMARK: [-v6.3]
  - NET_SCH_NETEM
  - NET_SCH_DRR
  - NET_SCH_MQPRIO
@@ -317,14 +318,14 @@ config:
  - NET_SCH_ETS: [v5.5]
  - NET_SCH_DEFAULT
  - NET_CLS_BASIC
- - NET_CLS_TCINDEX
+ - NET_CLS_TCINDEX: [-v6.3]
  - NET_CLS_ROUTE4
  - NET_CLS_FW
  - NET_CLS_U32
  - CLS_U32_PERF
  - CLS_U32_MARK
- - NET_CLS_RSVP
- - NET_CLS_RSVP6
+ - NET_CLS_RSVP: [-v6.3]
+ - NET_CLS_RSVP6: [-v6.3]
  - NET_CLS_FLOW
  - NET_CLS_CGROUP
  - NET_CLS_BPF
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index b083b3f88..edc89b950 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -350,10 +350,10 @@ config:
  - SND_USB_AUDIO
  - SND_FIREWORKS: n
  - SND_FIREWIRE_TASCAM: n
- - HID_BATTERY_STRENGTH
- - HIDRAW
- - UHID
- - USB_HIDDEV
+ - HID_BATTERY_STRENGTH: [-s390]
+ - HIDRAW: [-s390]
+ - UHID: [-s390]
+ - USB_HIDDEV: [-s390]
  - USB_ANNOUNCE_NEW_DEVICES
  - USB_OTG: [-s390]
  - USB_MON