11 files changed, 37 insertions, 22 deletions
diff --git a/dashboard/config/linux/bits/base.yml b/dashboard/config/linux/bits/base.yml
index 7903aa1ad..5d76fd2fd 100644
--- a/dashboard/config/linux/bits/base.yml
+++ b/dashboard/config/linux/bits/base.yml
@@ -228,3 +228,6 @@ config:
  - USB_GADGET_TARGET: n
  - USB_MIDI_GADGET: n
  - USB_CDC_COMPOSITE: n
+
+ # Don't need samples
+ - SAMPLES: n
diff --git a/dashboard/config/linux/bits/crypto.yml b/dashboard/config/linux/bits/crypto.yml
index d75ceb0b6..d89ff6d91 100644
--- a/dashboard/config/linux/bits/crypto.yml
+++ b/dashboard/config/linux/bits/crypto.yml
@@ -7,7 +7,7 @@ config:
  - CRYPTO_PCRYPT
  - CRYPTO_ECRDSA
  # Removed in "crypto: curve25519 - Remove unused kpp support"
- - CRYPTO_CURVE25519: [v5.6, -linux-next]
+ - CRYPTO_CURVE25519: [v5.6, -v6.18]
  - CRYPTO_CHACHA20POLY1305
  - CRYPTO_AEGIS128
  - CRYPTO_CFB: [-v5.8]
@@ -23,8 +23,8 @@ config:
  - CRYPTO_VMAC: [-v6.14]
  - CRYPTO_BLAKE2S: [v5.6, -v5.15]
  # Moved by "lib/crypto: blake2s: Consolidate into single C translation unit"
- - CRYPTO_BLAKE2S_X86: [v6.1, x86_64, -kmsan, -linux-next]
- - CRYPTO_BLAKE2S_ARM: [v6.1, arm]
+ - CRYPTO_BLAKE2S_X86: [v6.1, x86_64, -kmsan, -v6.18]
+ - CRYPTO_BLAKE2S_ARM: [v6.1, arm, -v6.18]
  - CRYPTO_MICHAEL_MIC
  - CRYPTO_RMD160
  # Removed in b21b9a5e0aef "crypto: rmd128 - remove RIPE-MD 128 hash algorithm".
@@ -121,7 +121,7 @@ config:
  - CRYPTO_SHA512_ARM: [arm, -v6.17]
  - CRYPTO_AES_ARM: [arm]
  - CRYPTO_CHACHA20_NEON: [arm, arm64]
- - CRYPTO_POLY1305_ARM: [arm]
+ - CRYPTO_POLY1305_ARM: [arm, -v6.18]
  # Moved by "lib/crypto: arm/sha1: Migrate optimized code into library".
  - CRYPTO_SHA1_ARM_NEON: [arm, -v6.17]
  # Moded by "lib/crypto: arm/sha1: Migrate optimized code into library".
@@ -134,7 +134,7 @@ config:
  - CRYPTO_CRCT10DIF_ARM_CE: [arm, -v6.14]
  - CRYPTO_CRC32_ARM_CE: [arm, -v6.14]
  - CRYPTO_NHPOLY1305_NEON: [arm, arm64]
- - CRYPTO_CURVE25519_NEON: [arm]
+ - CRYPTO_CURVE25519_NEON: [arm, -v6.18]
  # Moved by "lib/crypto: sha256: Consolidate into single module"
  - CRYPTO_SHA256_ARM64: [arm64, -v6.17]
  # Moved by "lib/crypto: arm64/sha512: Migrate optimized SHA-512 code to library"
@@ -157,5 +157,5 @@ config:
  - CRYPTO_AES_ARM64_CE_CCM: [arm64]
  - CRYPTO_AES_ARM64_CE_BLK: [arm64]
  - CRYPTO_AES_ARM64_NEON_BLK: [arm64]
- - CRYPTO_POLY1305_NEON: [arm64, -linux-next]
+ - CRYPTO_POLY1305_NEON: [arm64, -v6.18]
  - CRYPTO_AES_ARM64_BS: [arm64]
diff --git a/dashboard/config/linux/bits/debug.yml b/dashboard/config/linux/bits/debug.yml
index b7aa466be..f4160197d 100644
--- a/dashboard/config/linux/bits/debug.yml
+++ b/dashboard/config/linux/bits/debug.yml
@@ -36,6 +36,7 @@ config:
  - DEBUG_OBJECTS_TIMERS
  - DEBUG_OBJECTS_WORK
  - DEBUG_OBJECTS_SELFTEST: n
+ - WPROBE_EVENTS: [linux-next, -arm64]
  # Some base configs may not enable sound at all.
  - SND_DEBUG: [-riscv, -s390, optional]
  - SND_PCM_XRUN_DEBUG: [-riscv, -s390, optional]
diff --git a/dashboard/config/linux/bits/filesystems.yml b/dashboard/config/linux/bits/filesystems.yml
index 364ad249c..cb7b0feb2 100644
--- a/dashboard/config/linux/bits/filesystems.yml
+++ b/dashboard/config/linux/bits/filesystems.yml
@@ -167,9 +167,13 @@ config:
  - 9P_FS_SECURITY
 
  # Removed by "ext4: remove obsolete EXT3 config options".
- - EXT3_FS: [-linux-next]
- - EXT3_FS_POSIX_ACL: [-linux-next]
- - EXT3_FS_SECURITY: [-linux-next]
+ - EXT3_FS: [-v6.18]
+ - EXT3_FS_POSIX_ACL: [-v6.18]
+ - EXT3_FS_SECURITY: [-v6.18]
+
+ - EXT4_FS: [v6.18]
+ - EXT4_FS_POSIX_ACL: [v6.18]
+ - EXT4_FS_SECURITY: [v6.18]
 
  - REISERFS_FS: [-v6.12]
  - REISERFS_FS_XATTR: [-v6.12]
@@ -197,12 +201,12 @@ config:
  - ROMFS_ON_BLOCK
  - ROMFS_ON_MTD
 
- - BCACHEFS_FS: [v6.7]
- - BCACHEFS_ERASURE_CODING: [v6.7]
- - BCACHEFS_POSIX_ACL: [v6.7]
- - BCACHEFS_QUOTA: [v6.7]
- - BCACHEFS_DEBUG: [v6.7]
- - BCACHEFS_SIX_OPTIMISTIC_SPIN: [v6.8]
+ - BCACHEFS_FS: [v6.7, -v6.18]
+ - BCACHEFS_ERASURE_CODING: [v6.7, -v6.18]
+ - BCACHEFS_POSIX_ACL: [v6.7, -v6.18]
+ - BCACHEFS_QUOTA: [v6.7, -v6.18]
+ - BCACHEFS_DEBUG: [v6.7, -v6.18]
+ - BCACHEFS_SIX_OPTIMISTIC_SPIN: [v6.8, -v6.18]
 
  - FSCACHE
  - CACHEFILES
diff --git a/dashboard/config/linux/bits/linux-next.yml b/dashboard/config/linux/bits/linux-next.yml
index 472c27500..959e6785f 100644
--- a/dashboard/config/linux/bits/linux-next.yml
+++ b/dashboard/config/linux/bits/linux-next.yml
@@ -3,4 +3,6 @@
 
 kernel:
  repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git
- tag: next-20250929
+ tag: next-20251014
+config:
+ - BOOTPARAM_HUNG_TASK_PANIC: [1, weak]
diff --git a/dashboard/config/linux/bits/linux-upstream.yml b/dashboard/config/linux/bits/linux-upstream.yml
index 6126f7824..755ca58ff 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.17
+ tag: v6.18-rc1
diff --git a/dashboard/config/linux/bits/net-extra.yml b/dashboard/config/linux/bits/net-extra.yml
index 1280fd2fc..768970d24 100644
--- a/dashboard/config/linux/bits/net-extra.yml
+++ b/dashboard/config/linux/bits/net-extra.yml
@@ -13,7 +13,8 @@ config:
 
  - IP_SCTP
  # See "sctp: Convert cookie authentication to use HMAC-SHA256".
- - SCTP_COOKIE_HMAC_SHA1: [-linux-next]
+ - SCTP_COOKIE_HMAC_SHA1: [-v6.18]
+ - SCTP_DEFAULT_COOKIE_HMAC_SHA256: [v6.18]
  - NF_CT_PROTO_SCTP
  - NETFILTER_XT_MATCH_SCTP
 
@@ -26,7 +27,7 @@ config:
 
  - BATMAN_ADV
  # Removed by "batman-adv: remove network coding support".
- - BATMAN_ADV_NC: [-linux-next]
+ - BATMAN_ADV_NC: [-v6.18]
  - BATMAN_ADV_SYSFS: [-v5.11]
  - BATMAN_ADV_BATMAN_V
  - BATMAN_ADV_BLA
diff --git a/dashboard/config/linux/bits/net.yml b/dashboard/config/linux/bits/net.yml
index d076f14a4..570d980d4 100644
--- a/dashboard/config/linux/bits/net.yml
+++ b/dashboard/config/linux/bits/net.yml
@@ -20,9 +20,9 @@ config:
  - NET_KEY
  - NET_KEY_MIGRATE
  # SMC requires DIBS (Direct Internal Buffer Sharing).
- - DIBS: [linux-next]
+ - DIBS: [v6.18]
  # DIBS_LO enables the creation of HW independent testing client.
- - DIBS_LO: [linux-next]
+ - DIBS_LO: [v6.18]
  - SMC
  - SMC_DIAG
  - XDP_SOCKETS
@@ -50,6 +50,7 @@ config:
  - NET_FOU_IP_TUNNELS
  - INET_AH
  - INET_ESP
+ - INET_PSP: [v6.18]
  - INET_ESP_OFFLOAD
  - INET_ESPINTCP: [v5.6]
  - INET_IPCOMP
diff --git a/dashboard/config/linux/bits/rust.yml b/dashboard/config/linux/bits/rust.yml
index 8f6ef464a..5694ef93a 100644
--- a/dashboard/config/linux/bits/rust.yml
+++ b/dashboard/config/linux/bits/rust.yml
@@ -9,3 +9,5 @@ config:
   - BLK_DEV_RUST_NULL
   - RUST_DEBUG_ASSERTIONS
   - RUST_OVERFLOW_CHECKS
+  - RUST_BITMAP_HARDENED: [v6.18]
+  - RUST_BUILD_ASSERT_ALLOW: [v6.18]
diff --git a/dashboard/config/linux/bits/selinux.yml b/dashboard/config/linux/bits/selinux.yml
index 919e92140..140fba9fc 100644
--- a/dashboard/config/linux/bits/selinux.yml
+++ b/dashboard/config/linux/bits/selinux.yml
@@ -9,5 +9,4 @@ config:
  - SECURITY_SELINUX_DISABLE: n
  - DEFAULT_SECURITY_SELINUX
  # Otherwise we get the "SELinux: (dev *, type ext4) has no security xattr handler" error.
- - EXT4_FS_SECURITY
  - LSM: "landlock,lockdown,yama,safesetid,integrity,tomoyo,selinux,bpf"
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index f236dc35e..4d9c908b2 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -368,6 +368,7 @@ config:
  - SND_FIREWIRE_TASCAM: n
  - HID_BATTERY_STRENGTH: [-s390]
  - HIDRAW: [-s390]
+ - HID_HAPTIC: [v6.18]
  - UHID: [-s390]
  - USB_HIDDEV: [-s390]
  - USB_ANNOUNCE_NEW_DEVICES
@@ -385,6 +386,7 @@ config:
  - USB_UAS
  - USB_DWC3
  - USB_DWC3_GADGET
+ - USB_DWC3_GENERIC_PLAT: [v6.18]
  - USB_CHIPIDEA
  - USB_CHIPIDEA_UDC
  - USB_SERIAL