[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 66e1d282c8e46168677abed8606cbbfb6c1ffe1c

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 66e1d282c8e46168677abed8606cbbfb6c1ffe1c

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3268 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  66e1d282c8e46168677abed8606cbbfb6c1ffe1c (commit)
       via  9a8d32f8ede08be18c8b2db56e04fe06b27ee22b (commit)
      from  a23189d202df8c3b80e0594b0e4a1710f9831252 (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 66e1d282c8e46168677abed8606cbbfb6c1ffe1c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jan 24 09:30:05 2025 +0100

    kernel: update to 6.12.11
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 9a8d32f8ede08be18c8b2db56e04fe06b27ee22b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Jan 24 08:37:49 2025 +0100

    collectd: load syslog plugin first
    
    this remove the plugin load ouptput on the console at collectd startup.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/collectd/collectd.conf             | 2 +-
 config/kernel/kernel.config.x86_64-ipfire | 2 +-
 lfs/linux                                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

Difference in files:
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 9debe4a256..be6f1fd12c 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -12,6 +12,7 @@ TypesDB     "/usr/share/collectd/types.db"
 Interval     30
 ReadThreads  1
 
+LoadPlugin syslog
 LoadPlugin conntrack
 LoadPlugin cpu
 #LoadPlugin cpufreq
@@ -25,7 +26,6 @@ LoadPlugin ping
 LoadPlugin rrdtool
 LoadPlugin sensors
 LoadPlugin swap
-LoadPlugin syslog
 #LoadPlugin wireless
 LoadPlugin match_regex
 
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index d4501f99eb..e333198b74 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.12.10 Kernel Configuration
+# Linux/x86 6.12.11 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/lfs/linux b/lfs/linux
index bbd6a2ecce..41ebb57cbf 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 6.12.10
+VER         = 6.12.11
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -69,7 +69,7 @@ objects = \
 
 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 3146bbc9075b84db4c6ad3a64cbb91e3c379d0b8e9e90029eaf6a5bd37ea2b8a0a4ac1227e73d0e8acd20cab392841e046e148523bdb206302ea6c37a934b451
+$(DL_FILE)_BLAKE2 = 8f31f2aed810d1fe724142011731f361a543da301a1a14c92b852c8cf81f7c4bdce1b74783e0dd965d7bf225dc6006b44eed622bf6dff09312265ce3cae1ea32
 
 install : $(TARGET)
 


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