From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 29 Nov 2021 09:14:33 +0000 (+0000)
Subject: kernel: update arm config and rootfile (oldconfig)
X-Git-Tag: v2.27-core162~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef972dcf7af72f2ba809e21fb04f10ca868e19d8;p=ipfire-2.x.git

kernel: update arm config and rootfile (oldconfig)

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 7a6e9a545f..96ddc272de 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 5.15.3-ipfire Kernel Configuration
+# Linux/arm64 5.15.5-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -7393,6 +7393,7 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 # CONFIG_PSTORE_RAM is not set
+# CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EROFS_FS is not set
diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire
index fe37469d61..7913d5cf03 100644
--- a/config/kernel/kernel.config.armv6l-ipfire
+++ b/config/kernel/kernel.config.armv6l-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.15.3-ipfire Kernel Configuration
+# Linux/arm 5.15.5-ipfire Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -960,6 +960,7 @@ CONFIG_ZONE_DMA=y
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_TEST is not set
 CONFIG_KMAP_LOCAL=y
+CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
 
 #
 # Data Access Monitoring
@@ -7414,6 +7415,7 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 # CONFIG_PSTORE_RAM is not set
+# CONFIG_PSTORE_BLK is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 # CONFIG_EROFS_FS is not set
diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux
index f3a7bcc0e2..070087d544 100644
--- a/config/rootfiles/common/armv6l/linux
+++ b/config/rootfiles/common/armv6l/linux
@@ -8613,6 +8613,7 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/KEYBOARD_TWL4030
 #lib/modules/KVER-ipfire/build/include/config/KEYS
 #lib/modules/KVER-ipfire/build/include/config/KMAP_LOCAL
+#lib/modules/KVER-ipfire/build/include/config/KMAP_LOCAL_NON_LINEAR_PTE_ARRAY
 #lib/modules/KVER-ipfire/build/include/config/KS8842
 #lib/modules/KVER-ipfire/build/include/config/KS8851_MLL
 #lib/modules/KVER-ipfire/build/include/config/KSM