From ca0ee75c5b83c593b3d7371dc403d965dfa40f77 Mon Sep 17 00:00:00 2001
From: Eero Tamminen <oak@helsinkinet.fi>
Date: Sun, 19 Apr 2026 01:49:08 +0300
Subject: [PATCH] m68k-linux: update to v7.0 (latest) kernel

---
 doc/m68k-linux.txt        | 11 ++++++-----
 tools/linux/kernel.config | 11 +++++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/doc/m68k-linux.txt b/doc/m68k-linux.txt
index c6a3d5f43..bdd437098 100644
--- a/doc/m68k-linux.txt
+++ b/doc/m68k-linux.txt
@@ -132,7 +132,7 @@ VFS: Cannot open root device "/dev/sda" or unknown-block(8,0): error -6
    $ sudo apt install gcc-m68k-linux-gnu
 
 2. Get latest upstream kernel sources:
-     $ release=v6.19
+     $ release=v7.0
      $ repo=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
    Either just the latest release (= faster):
      $ git clone --depth 1 --branch $release $repo
@@ -306,8 +306,8 @@ Notes:
 1. Set suitable options in lilo.cfg, for example:
 -------------------------------------
 [LILO]
-Kernel = vmlinux-v6.19
-Symbols = System.map-v6.19
+Kernel = vmlinux-v7.0
+Symbols = System.map-v7.0
 Ramdisk =
 Args = video=atafb:sthigh console=tty
 KernelToFastRam = FALSE
@@ -692,7 +692,7 @@ $ aranym-mmu -l linux.config
 
 - Hatari debug output shows IDE and DSP reset messages on Falcon at
   2Hz (from floppy media change detection) if Linux is started with
-  --lilo, instead of from TOS.  This is because TOS initializes PSG
+  "--lilo", instead of from TOS.  This is because TOS initializes PSG
   port-A register bits to sensible values and Linux does not.
 
   Workaround: included kernel patch
@@ -750,7 +750,8 @@ Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0)
   cache emulation is disabled (--data-cache off).
 
   However, when data cache is enabled, boots crash to double bus
-  error.  Although screen is black, CPU trace indicates a panic.
+  error.  Although screen is black, CPU trace indicates a panic. With
+  040, panic is called in atari_stram_init(), with 60, somewhere else.
 
   Note: when booting Linux with "bootstra.prg" instead directly with
   LILO, kernel panics immediately even with cache emulation disabled.
diff --git a/tools/linux/kernel.config b/tools/linux/kernel.config
index 4bfab0603..fa9d596a7 100644
--- a/tools/linux/kernel.config
+++ b/tools/linux/kernel.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/m68k 6.19.0 Kernel Configuration
+# Linux/m68k 7.0.0 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="m68k-linux-gnu-gcc (Debian 14.2.0-19) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1501,7 +1501,6 @@ CONFIG_DMA_DIRECT_REMAP=y
 CONFIG_FORCE_NR_CPUS=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
-# CONFIG_GLOB_SELFTEST is not set
 CONFIG_NLATTR=y
 CONFIG_GENERIC_ATOMIC64=y
 # CONFIG_IRQ_POLL is not set
@@ -1605,12 +1604,13 @@ CONFIG_DEBUG_SHIRQ=y
 CONFIG_PANIC_TIMEOUT=0
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=0
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC=0
 CONFIG_DETECT_HUNG_TASK_BLOCKER=y
 CONFIG_WQ_WATCHDOG=y
+CONFIG_BOOTPARAM_WQ_STALL_PANIC=0
 # CONFIG_WQ_CPU_INTENSIVE_REPORT is not set
 # end of Debug Oops, Lockups and Hangs
 
@@ -1620,6 +1620,8 @@ CONFIG_WQ_WATCHDOG=y
 # CONFIG_SCHEDSTATS is not set
 # end of Scheduler Debugging
 
+# CONFIG_DEBUG_ATOMIC is not set
+
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #
@@ -1634,7 +1636,6 @@ CONFIG_WQ_WATCHDOG=y
 # end of Lock Debugging (spinlocks, mutexes, etc...)
 
 # CONFIG_DEBUG_IRQFLAGS is not set
-# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_HAVE_DEBUG_BUGVERBOSE=y
 
@@ -1684,3 +1685,5 @@ CONFIG_ARCH_USE_MEMTEST=y
 #
 # end of Rust hacking
 # end of Kernel hacking
+
+CONFIG_IO_URING_BPF=y