[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d1694c7e5f3a088c6aeef74fc51352b7611a008

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d1694c7e5f3a088c6aeef74fc51352b7611a008

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5423 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  1d1694c7e5f3a088c6aeef74fc51352b7611a008 (commit)
       via  cfe911bab5692864e28675bcbad2a88f1729402e (commit)
      from  026eafd5860ea9fa3a134003d388be356fb266d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1d1694c7e5f3a088c6aeef74fc51352b7611a008
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 27 07:59:29 2023 +0000

    kernel: update aarch64 rootfile
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit cfe911bab5692864e28675bcbad2a88f1729402e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 27 07:56:20 2023 +0000

    kernel: update to 6.1.60
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.aarch64-ipfire | 2 +-
 config/kernel/kernel.config.riscv64-ipfire | 2 +-
 config/kernel/kernel.config.x86_64-ipfire  | 2 +-
 config/rootfiles/common/aarch64/linux      | 4 +---
 lfs/linux                                  | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index aeffce154..76655eabf 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.59-ipfire Kernel Configuration
+# Linux/arm64 6.1.60-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire
index 6562bbd8f..07c6aa008 100644
--- a/config/kernel/kernel.config.riscv64-ipfire
+++ b/config/kernel/kernel.config.riscv64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 6.1.59-ipfire Kernel Configuration
+# Linux/riscv 6.1.60-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 40f66849c..6d646c618 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.59-ipfire Kernel Configuration
+# Linux/x86 6.1.60-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 7c96e2b8d..40eeb0260 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -8505,7 +8505,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/INTEL_XWAY_PHY
 #lib/modules/KVER-ipfire/build/include/config/INTERVAL_TREE
 #lib/modules/KVER-ipfire/build/include/config/IOMMU_API
-#lib/modules/KVER-ipfire/build/include/config/IOMMU_DEFAULT_PASSTHROUGH
+#lib/modules/KVER-ipfire/build/include/config/IOMMU_DEFAULT_DMA_STRICT
 #lib/modules/KVER-ipfire/build/include/config/IOMMU_DMA
 #lib/modules/KVER-ipfire/build/include/config/IOMMU_IOVA
 #lib/modules/KVER-ipfire/build/include/config/IOMMU_IO_PGTABLE
@@ -8514,8 +8514,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/IONIC
 #lib/modules/KVER-ipfire/build/include/config/IOSCHED_BFQ
 #lib/modules/KVER-ipfire/build/include/config/IO_STRICT_DEVMEM
-#lib/modules/KVER-ipfire/build/include/config/IO_URING
-#lib/modules/KVER-ipfire/build/include/config/IO_WQ
 #lib/modules/KVER-ipfire/build/include/config/IP6_NF_FILTER
 #lib/modules/KVER-ipfire/build/include/config/IP6_NF_IPTABLES
 #lib/modules/KVER-ipfire/build/include/config/IP6_NF_MANGLE
diff --git a/lfs/linux b/lfs/linux
index 5743ebf9d..ca82b6522 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 6.1.59
+VER         = 6.1.60
 ARM_PATCHES = 6.1.y-ipfire2
 
 THISAPP    = linux-$(VER)
@@ -75,7 +75,7 @@ objects = \
 $(DL_FILE)					= $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz	= $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_BLAKE2 = 8b805f75f745e6fff9d7628fb1702475ad4c94010f764d733e1c1b4d860f6e593a79ccb8aa3a8c6c0de2ffdc2c192aaa661966549a7383ceb026a59e0d949e49
+$(DL_FILE)_BLAKE2 = 6d6723dd839b9003ea2a46be849e36516a97497ba3743860c8081795b372c70536465c46defd6ab4f97e81127b1bf40d78270b1a3a721a7331a935d1ef8417c4
 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
 
 install : $(TARGET)


hooks/post-receive
--
IPFire 2.x development tree