kernel: update to 6.1.30

Message ID 20230525211638.3243521-1-arne_f@ipfire.org
State Accepted
Commit 25aa552258cae0ee12fa63adf9365680153aa441
Headers
Series kernel: update to 6.1.30 |

Commit Message

Arne Fitzenreiter May 25, 2023, 9:16 p.m. UTC
  Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/kernel/kernel.config.aarch64-ipfire | 2 +-
 config/kernel/kernel.config.x86_64-ipfire  | 2 +-
 config/rootfiles/common/aarch64/linux      | 3 +++
 config/rootfiles/common/x86_64/linux       | 5 +++--
 lfs/linux                                  | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)
  

Patch

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index ddccc4d42..2261c22dc 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.29-ipfire Kernel Configuration
+# Linux/arm64 6.1.30-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.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 aaeada8be..121d1cda9 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.29-ipfire Kernel Configuration
+# Linux/x86 6.1.30-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index cfadb4427..243eb8d46 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -5284,6 +5284,9 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/dell/Makefile
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/dell/dell-wmi-sysman
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/dell/dell-wmi-sysman/Makefile
+#lib/modules/KVER-ipfire/build/drivers/platform/x86/hp
+#lib/modules/KVER-ipfire/build/drivers/platform/x86/hp/Kconfig
+#lib/modules/KVER-ipfire/build/drivers/platform/x86/hp/Makefile
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/intel
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/intel/Kconfig
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/intel/Makefile
diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index 0300e7779..f5e7ced10 100644
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -5119,6 +5119,9 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/dell/Makefile
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/dell/dell-wmi-sysman
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/dell/dell-wmi-sysman/Makefile
+#lib/modules/KVER-ipfire/build/drivers/platform/x86/hp
+#lib/modules/KVER-ipfire/build/drivers/platform/x86/hp/Kconfig
+#lib/modules/KVER-ipfire/build/drivers/platform/x86/hp/Makefile
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/intel
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/intel/Kconfig
 #lib/modules/KVER-ipfire/build/drivers/platform/x86/intel/Makefile
@@ -8141,7 +8144,6 @@  etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/HPWDT_NMI_DECODING
 #lib/modules/KVER-ipfire/build/include/config/HP_ILO
 #lib/modules/KVER-ipfire/build/include/config/HP_WATCHDOG
-#lib/modules/KVER-ipfire/build/include/config/HP_WMI
 #lib/modules/KVER-ipfire/build/include/config/HSI
 #lib/modules/KVER-ipfire/build/include/config/HSI_BOARDINFO
 #lib/modules/KVER-ipfire/build/include/config/HSI_CHAR
@@ -21711,7 +21713,6 @@  lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/fujitsu-laptop.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/gigabyte-wmi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/hdaps.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/platform/x86/hp-wmi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/ideapad-laptop.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/intel
 #lib/modules/KVER-ipfire/kernel/drivers/platform/x86/intel/intel-rst.ko.xz
diff --git a/lfs/linux b/lfs/linux
index 4e9244dde..b30a28fff 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@ 
 
 include Config
 
-VER         = 6.1.29
+VER         = 6.1.30
 
 ARM_PATCHES = 6.1.y-ipfire2
 
@@ -76,7 +76,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 = b6cf62bc9f1a9120f04857911e2a8fcf3fc5416f55b7d7bc61ded730941220f6f3202d1a86e14dc9f38f6dd40ef7614d52126d9089ccd0cc1eda144df6b102ba
+$(DL_FILE)_BLAKE2 = d3c4cda0bbd978ad7e39a44e03789f38b7a48a92405312f90fd944a670ca438e1dd212af2b075820896b25405027be92071dbd24455331de742aa5c9f2ac3407
 arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
 
 install : $(TARGET)