linux: update to 6.1.69

13 files changed, 3 insertions, 57 deletions

diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index 7e56e8e83..9e39bbf6e 100644
--- a/mk/linux-ver.mk
+++ b/mk/linux-ver.mk
@@ -22,10 +22,10 @@ KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 KERNEL_HASH:=		8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y)
-KERNEL_FILE_VER:=	6.1.53
+KERNEL_FILE_VER:=	6.1.69
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		5f57e0a04810d24f2b1a8fc95451241f80530e678717eda0f45104c6dc78ed7e
+KERNEL_HASH:=		7e3d2694d18ce502068cc88a430da809abbd17d0773268524ebece442612b541
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y)
 KERNEL_FILE_VER:=	5.15.128
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 8f65156c3..5ce7c68b7 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -47,7 +47,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_5
 	depends on !ADK_TARGET_ARCH_NDS32
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_6_1
-	bool "6.1.53"
+	bool "6.1.69"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
diff --git a/target/linux/patches/6.1.53/armnommu-fix-elf-fdpic-personality.patch b/target/linux/patches/6.1.53/armnommu-fix-elf-fdpic-personality.patch
deleted file mode 100644
index 78b1a10ff..000000000
--- a/target/linux/patches/6.1.53/armnommu-fix-elf-fdpic-personality.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ab7647c2b04501297c50ce7cdb6f6895b9582d22 Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@kernel.org>
-Date: Fri, 21 Apr 2023 00:21:38 +1000
-Subject: [PATCH] fs: binfmt_elf_efpic: fix personality for fdpic ELF
-
-The elf-fdpic loader hard sets the process personality to either
-PER_LINUX_FDPIC for true elf-fdpic binaries or to PER_LINUX for
-normal ELF binaries (in this case they would be constant displacement
-compiled with -pie for example). The problem with that is that it
-will lose any other bits that may be in the ELF header personality
-(such as the "bug emulation" bits).
-
-On the ARM architecture the ADDR_LIMIT_32BIT flag is used to signify
-a normal 32bit binary - as opposed to a legacy 26bit address binary.
-This matters since start_thread() will set the ARM CPSR register as
-required based on this flag. If the elf-fdpic loader loses this bit
-the process will be mis-configured and crash out pretty quickly.
-
-Modify elf-fdpic loaders personality setting binaries so that it
-preserves the upper three bytes by using the SET_PERSONALITY macro
-to set it. This macro in the generic case sets PER_LINUX and preserves
-the upper bytes. Architectures can override this for their specific
-use case, and ARM does exactly this.
-
-The problem shows up quite easily runing under qemu, but not necessarily
-on all types of real ARM hardware. If the underlying ARM processor does
-not support the legacy 26-bit addressing mode then everyting will work
-as expected.
-
-Signed-off-by: Greg Ungerer <gerg@kernel.org>
----
- fs/binfmt_elf_fdpic.c |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
-index a05eafcacfb2..f29ae1d96fd7 100644
---- a/fs/binfmt_elf_fdpic.c
-+++ b/fs/binfmt_elf_fdpic.c
-@@ -345,10 +345,9 @@
- 	/* there's now no turning back... the old userspace image is dead,
- 	 * defunct, deceased, etc.
- 	 */
-+	SET_PERSONALITY(exec_params.hdr);
- 	if (elf_check_fdpic(&exec_params.hdr))
--		set_personality(PER_LINUX_FDPIC);
--	else
--		set_personality(PER_LINUX);
-+		current->personality |= PER_LINUX_FDPIC;
- 	if (elf_read_implies_exec(&exec_params.hdr, executable_stack))
- 		current->personality |= READ_IMPLIES_EXEC;
- 
--- 
-2.25.1
-
diff --git a/target/linux/patches/6.1.53/armnommu-fix-thread-registers.patch b/target/linux/patches/6.1.69/armnommu-fix-thread-registers.patch
index 8ab2196dc..8ab2196dc 100644
--- a/target/linux/patches/6.1.53/armnommu-fix-thread-registers.patch
+++ b/target/linux/patches/6.1.69/armnommu-fix-thread-registers.patch
diff --git a/target/linux/patches/6.1.53/armnommu-versatile.patch b/target/linux/patches/6.1.69/armnommu-versatile.patch
index f8f10f50b..f8f10f50b 100644
--- a/target/linux/patches/6.1.53/armnommu-versatile.patch
+++ b/target/linux/patches/6.1.69/armnommu-versatile.patch
diff --git a/target/linux/patches/6.1.53/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.69/board-rockpi4-0003-arm64-dts-pcie.patch
index 1777e7a86..1777e7a86 100644
--- a/target/linux/patches/6.1.53/board-rockpi4-0003-arm64-dts-pcie.patch
+++ b/target/linux/patches/6.1.69/board-rockpi4-0003-arm64-dts-pcie.patch
diff --git a/target/linux/patches/6.1.53/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.69/enable-ethernet-bpi-m2-plus.patch
index 7e9abd9ce..7e9abd9ce 100644
--- a/target/linux/patches/6.1.53/enable-ethernet-bpi-m2-plus.patch
+++ b/target/linux/patches/6.1.69/enable-ethernet-bpi-m2-plus.patch
diff --git a/target/linux/patches/6.1.53/hppa-cross-compile.patch b/target/linux/patches/6.1.69/hppa-cross-compile.patch
index 5400e87a0..5400e87a0 100644
--- a/target/linux/patches/6.1.53/hppa-cross-compile.patch
+++ b/target/linux/patches/6.1.69/hppa-cross-compile.patch
diff --git a/target/linux/patches/6.1.53/macsonic.patch b/target/linux/patches/6.1.69/macsonic.patch
index 177397221..177397221 100644
--- a/target/linux/patches/6.1.53/macsonic.patch
+++ b/target/linux/patches/6.1.69/macsonic.patch
diff --git a/target/linux/patches/6.1.53/nios2.patch b/target/linux/patches/6.1.69/nios2.patch
index 43631971e..43631971e 100644
--- a/target/linux/patches/6.1.53/nios2.patch
+++ b/target/linux/patches/6.1.69/nios2.patch
diff --git a/target/linux/patches/6.1.53/riscv32.patch b/target/linux/patches/6.1.69/riscv32.patch
index 648b0de4d..648b0de4d 100644
--- a/target/linux/patches/6.1.53/riscv32.patch
+++ b/target/linux/patches/6.1.69/riscv32.patch
diff --git a/target/linux/patches/6.1.53/rockchip-115200.patch b/target/linux/patches/6.1.69/rockchip-115200.patch
index ad8a2d7a7..ad8a2d7a7 100644
--- a/target/linux/patches/6.1.53/rockchip-115200.patch
+++ b/target/linux/patches/6.1.69/rockchip-115200.patch
diff --git a/target/linux/patches/6.1.53/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.69/rockchip-pcie-timeout.patch
index 2ef7df2da..2ef7df2da 100644
--- a/target/linux/patches/6.1.53/rockchip-pcie-timeout.patch
+++ b/target/linux/patches/6.1.69/rockchip-pcie-timeout.patch