Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 6 Jul 2023, at 06:00, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
> 
> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
> ---
> config/kernel/kernel.config.aarch64-ipfire |  9 +++---
> config/kernel/kernel.config.x86_64-ipfire  | 12 +++----
> config/rootfiles/common/aarch64/linux      | 37 ++++++++++++----------
> config/rootfiles/common/x86_64/linux       | 37 ++++++++++++----------
> lfs/linux                                  |  4 +--
> 5 files changed, 55 insertions(+), 44 deletions(-)
> 
> diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
> index 2261c22dc..a2c852654 100644
> --- a/config/kernel/kernel.config.aarch64-ipfire
> +++ b/config/kernel/kernel.config.aarch64-ipfire
> @@ -1,10 +1,10 @@
> #
> # Automatically generated file; DO NOT EDIT.
> -# Linux/arm64 6.1.30-ipfire Kernel Configuration
> +# Linux/arm64 6.1.37-ipfire Kernel Configuration
> #
> -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
> +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0"
> CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=120200
> +CONFIG_GCC_VERSION=130100
> CONFIG_CLANG_VERSION=0
> CONFIG_AS_IS_GNU=y
> CONFIG_AS_VERSION=24000
> @@ -954,6 +954,7 @@ CONFIG_MAPPING_DIRTY_HELPERS=y
> # CONFIG_ANON_VMA_NAME is not set
> # CONFIG_USERFAULTFD is not set
> # CONFIG_LRU_GEN is not set
> +CONFIG_LOCK_MM_AND_FIND_VMA=y
> 
> #
> # Data Access Monitoring
> @@ -7835,7 +7836,7 @@ CONFIG_CIFS_FSCACHE=y
> CONFIG_SMB_SERVER=m
> CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
> CONFIG_SMB_SERVER_KERBEROS5=y
> -CONFIG_SMBFS_COMMON=m
> +CONFIG_SMBFS=m
> # CONFIG_CODA_FS is not set
> # CONFIG_AFS_FS is not set
> CONFIG_NLS=y
> diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
> index 121d1cda9..0017a6f54 100644
> --- a/config/kernel/kernel.config.x86_64-ipfire
> +++ b/config/kernel/kernel.config.x86_64-ipfire
> @@ -1,10 +1,10 @@
> #
> # Automatically generated file; DO NOT EDIT.
> -# Linux/x86 6.1.30-ipfire Kernel Configuration
> +# Linux/x86 6.1.37-ipfire Kernel Configuration
> #
> -CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
> +CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0"
> CONFIG_CC_IS_GCC=y
> -CONFIG_GCC_VERSION=120200
> +CONFIG_GCC_VERSION=130100
> CONFIG_CLANG_VERSION=0
> CONFIG_AS_IS_GNU=y
> CONFIG_AS_VERSION=24000
> @@ -996,6 +996,7 @@ CONFIG_MAPPING_DIRTY_HELPERS=y
> # CONFIG_ANON_VMA_NAME is not set
> # CONFIG_USERFAULTFD is not set
> # CONFIG_LRU_GEN is not set
> +CONFIG_LOCK_MM_AND_FIND_VMA=y
> 
> #
> # Data Access Monitoring
> @@ -6523,9 +6524,8 @@ CONFIG_AMILO_RFKILL=m
> CONFIG_FUJITSU_LAPTOP=m
> # CONFIG_FUJITSU_TABLET is not set
> # CONFIG_GPD_POCKET_FAN is not set
> -# CONFIG_HP_ACCEL is not set
> +# CONFIG_X86_PLATFORM_DRIVERS_HP is not set
> # CONFIG_WIRELESS_HOTKEY is not set
> -CONFIG_HP_WMI=m
> # CONFIG_IBM_RTL is not set
> CONFIG_IDEAPAD_LAPTOP=m
> CONFIG_SENSORS_HDAPS=m
> @@ -7047,7 +7047,7 @@ CONFIG_CIFS_FSCACHE=y
> CONFIG_SMB_SERVER=m
> CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
> CONFIG_SMB_SERVER_KERBEROS5=y
> -CONFIG_SMBFS_COMMON=m
> +CONFIG_SMBFS=m
> # CONFIG_CODA_FS is not set
> # CONFIG_AFS_FS is not set
> CONFIG_NLS=y
> diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
> index 243eb8d46..49bbc7c57 100644
> --- a/config/rootfiles/common/aarch64/linux
> +++ b/config/rootfiles/common/aarch64/linux
> @@ -6277,9 +6277,6 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/fs/ceph
> #lib/modules/KVER-ipfire/build/fs/ceph/Kconfig
> #lib/modules/KVER-ipfire/build/fs/ceph/Makefile
> -#lib/modules/KVER-ipfire/build/fs/cifs
> -#lib/modules/KVER-ipfire/build/fs/cifs/Kconfig
> -#lib/modules/KVER-ipfire/build/fs/cifs/Makefile
> #lib/modules/KVER-ipfire/build/fs/coda
> #lib/modules/KVER-ipfire/build/fs/coda/Kconfig
> #lib/modules/KVER-ipfire/build/fs/coda/Makefile
> @@ -6370,9 +6367,6 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/fs/kernfs
> #lib/modules/KVER-ipfire/build/fs/kernfs/Kconfig
> #lib/modules/KVER-ipfire/build/fs/kernfs/Makefile
> -#lib/modules/KVER-ipfire/build/fs/ksmbd
> -#lib/modules/KVER-ipfire/build/fs/ksmbd/Kconfig
> -#lib/modules/KVER-ipfire/build/fs/ksmbd/Makefile
> #lib/modules/KVER-ipfire/build/fs/lockd
> #lib/modules/KVER-ipfire/build/fs/lockd/Makefile
> #lib/modules/KVER-ipfire/build/fs/minix
> @@ -6462,8 +6456,17 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/fs/romfs
> #lib/modules/KVER-ipfire/build/fs/romfs/Kconfig
> #lib/modules/KVER-ipfire/build/fs/romfs/Makefile
> -#lib/modules/KVER-ipfire/build/fs/smbfs_common
> -#lib/modules/KVER-ipfire/build/fs/smbfs_common/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb
> +#lib/modules/KVER-ipfire/build/fs/smb/Kconfig
> +#lib/modules/KVER-ipfire/build/fs/smb/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb/client
> +#lib/modules/KVER-ipfire/build/fs/smb/client/Kconfig
> +#lib/modules/KVER-ipfire/build/fs/smb/client/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb/common
> +#lib/modules/KVER-ipfire/build/fs/smb/common/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb/server
> +#lib/modules/KVER-ipfire/build/fs/smb/server/Kconfig
> +#lib/modules/KVER-ipfire/build/fs/smb/server/Makefile
> #lib/modules/KVER-ipfire/build/fs/squashfs
> #lib/modules/KVER-ipfire/build/fs/squashfs/Kconfig
> #lib/modules/KVER-ipfire/build/fs/squashfs/Makefile
> @@ -8796,6 +8799,7 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/include/config/LOCKD_V4
> #lib/modules/KVER-ipfire/build/include/config/LOCK_DEBUGGING_SUPPORT
> #lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_NONE
> +#lib/modules/KVER-ipfire/build/include/config/LOCK_MM_AND_FIND_VMA
> #lib/modules/KVER-ipfire/build/include/config/LOCK_SPIN_ON_OWNER
> #lib/modules/KVER-ipfire/build/include/config/LOGO
> #lib/modules/KVER-ipfire/build/include/config/LOGO_LINUX_CLUT224
> @@ -10429,7 +10433,7 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/include/config/SLICOSS
> #lib/modules/KVER-ipfire/build/include/config/SLUB
> #lib/modules/KVER-ipfire/build/include/config/SLUB_CPU_PARTIAL
> -#lib/modules/KVER-ipfire/build/include/config/SMBFS_COMMON
> +#lib/modules/KVER-ipfire/build/include/config/SMBFS
> #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER
> #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_CHECK_CAP_NET_ADMIN
> #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_KERBEROS5
> @@ -21694,8 +21698,6 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/fs/btrfs/btrfs.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/cachefiles
> #lib/modules/KVER-ipfire/kernel/fs/cachefiles/cachefiles.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/cifs
> -#lib/modules/KVER-ipfire/kernel/fs/cifs/cifs.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/configfs
> #lib/modules/KVER-ipfire/kernel/fs/configfs/configfs.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/efivarfs
> @@ -21711,8 +21713,6 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/fs/fuse
> #lib/modules/KVER-ipfire/kernel/fs/fuse/cuse.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/fuse/fuse.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/ksmbd
> -#lib/modules/KVER-ipfire/kernel/fs/ksmbd/ksmbd.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/lockd
> #lib/modules/KVER-ipfire/kernel/fs/lockd/lockd.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/netfs
> @@ -21787,9 +21787,14 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/fs/ntfs3/ntfs3.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/reiserfs
> #lib/modules/KVER-ipfire/kernel/fs/reiserfs/reiserfs.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common
> -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_arc4.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_md4.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb
> +#lib/modules/KVER-ipfire/kernel/fs/smb/client
> +#lib/modules/KVER-ipfire/kernel/fs/smb/client/cifs.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb/common
> +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_arc4.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_md4.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb/server
> +#lib/modules/KVER-ipfire/kernel/fs/smb/server/ksmbd.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/udf
> #lib/modules/KVER-ipfire/kernel/fs/udf/udf.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/xfs
> diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
> index f5e7ced10..2da7da282 100644
> --- a/config/rootfiles/common/x86_64/linux
> +++ b/config/rootfiles/common/x86_64/linux
> @@ -6112,9 +6112,6 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/fs/ceph
> #lib/modules/KVER-ipfire/build/fs/ceph/Kconfig
> #lib/modules/KVER-ipfire/build/fs/ceph/Makefile
> -#lib/modules/KVER-ipfire/build/fs/cifs
> -#lib/modules/KVER-ipfire/build/fs/cifs/Kconfig
> -#lib/modules/KVER-ipfire/build/fs/cifs/Makefile
> #lib/modules/KVER-ipfire/build/fs/coda
> #lib/modules/KVER-ipfire/build/fs/coda/Kconfig
> #lib/modules/KVER-ipfire/build/fs/coda/Makefile
> @@ -6205,9 +6202,6 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/fs/kernfs
> #lib/modules/KVER-ipfire/build/fs/kernfs/Kconfig
> #lib/modules/KVER-ipfire/build/fs/kernfs/Makefile
> -#lib/modules/KVER-ipfire/build/fs/ksmbd
> -#lib/modules/KVER-ipfire/build/fs/ksmbd/Kconfig
> -#lib/modules/KVER-ipfire/build/fs/ksmbd/Makefile
> #lib/modules/KVER-ipfire/build/fs/lockd
> #lib/modules/KVER-ipfire/build/fs/lockd/Makefile
> #lib/modules/KVER-ipfire/build/fs/minix
> @@ -6297,8 +6291,17 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/fs/romfs
> #lib/modules/KVER-ipfire/build/fs/romfs/Kconfig
> #lib/modules/KVER-ipfire/build/fs/romfs/Makefile
> -#lib/modules/KVER-ipfire/build/fs/smbfs_common
> -#lib/modules/KVER-ipfire/build/fs/smbfs_common/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb
> +#lib/modules/KVER-ipfire/build/fs/smb/Kconfig
> +#lib/modules/KVER-ipfire/build/fs/smb/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb/client
> +#lib/modules/KVER-ipfire/build/fs/smb/client/Kconfig
> +#lib/modules/KVER-ipfire/build/fs/smb/client/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb/common
> +#lib/modules/KVER-ipfire/build/fs/smb/common/Makefile
> +#lib/modules/KVER-ipfire/build/fs/smb/server
> +#lib/modules/KVER-ipfire/build/fs/smb/server/Kconfig
> +#lib/modules/KVER-ipfire/build/fs/smb/server/Makefile
> #lib/modules/KVER-ipfire/build/fs/squashfs
> #lib/modules/KVER-ipfire/build/fs/squashfs/Kconfig
> #lib/modules/KVER-ipfire/build/fs/squashfs/Makefile
> @@ -8671,6 +8674,7 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/include/config/LOCKUP_DETECTOR
> #lib/modules/KVER-ipfire/build/include/config/LOCK_DEBUGGING_SUPPORT
> #lib/modules/KVER-ipfire/build/include/config/LOCK_DOWN_KERNEL_FORCE_NONE
> +#lib/modules/KVER-ipfire/build/include/config/LOCK_MM_AND_FIND_VMA
> #lib/modules/KVER-ipfire/build/include/config/LOCK_SPIN_ON_OWNER
> #lib/modules/KVER-ipfire/build/include/config/LOGO
> #lib/modules/KVER-ipfire/build/include/config/LOGO_LINUX_CLUT224
> @@ -10406,7 +10410,7 @@ etc/modprobe.d/ipv6.conf
> #lib/modules/KVER-ipfire/build/include/config/SLS
> #lib/modules/KVER-ipfire/build/include/config/SLUB
> #lib/modules/KVER-ipfire/build/include/config/SLUB_CPU_PARTIAL
> -#lib/modules/KVER-ipfire/build/include/config/SMBFS_COMMON
> +#lib/modules/KVER-ipfire/build/include/config/SMBFS
> #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER
> #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_CHECK_CAP_NET_ADMIN
> #lib/modules/KVER-ipfire/build/include/config/SMB_SERVER_KERBEROS5
> @@ -22267,8 +22271,6 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/fs/btrfs/btrfs.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/cachefiles
> #lib/modules/KVER-ipfire/kernel/fs/cachefiles/cachefiles.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/cifs
> -#lib/modules/KVER-ipfire/kernel/fs/cifs/cifs.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/configfs
> #lib/modules/KVER-ipfire/kernel/fs/configfs/configfs.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/dlm
> @@ -22286,8 +22288,6 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/fs/fuse
> #lib/modules/KVER-ipfire/kernel/fs/fuse/cuse.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/fuse/fuse.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/ksmbd
> -#lib/modules/KVER-ipfire/kernel/fs/ksmbd/ksmbd.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/lockd
> #lib/modules/KVER-ipfire/kernel/fs/lockd/lockd.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/netfs
> @@ -22362,9 +22362,14 @@ lib/modules/KVER-ipfire/kernel
> #lib/modules/KVER-ipfire/kernel/fs/ntfs3/ntfs3.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/reiserfs
> #lib/modules/KVER-ipfire/kernel/fs/reiserfs/reiserfs.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common
> -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_arc4.ko.xz
> -#lib/modules/KVER-ipfire/kernel/fs/smbfs_common/cifs_md4.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb
> +#lib/modules/KVER-ipfire/kernel/fs/smb/client
> +#lib/modules/KVER-ipfire/kernel/fs/smb/client/cifs.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb/common
> +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_arc4.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb/common/cifs_md4.ko.xz
> +#lib/modules/KVER-ipfire/kernel/fs/smb/server
> +#lib/modules/KVER-ipfire/kernel/fs/smb/server/ksmbd.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/udf
> #lib/modules/KVER-ipfire/kernel/fs/udf/udf.ko.xz
> #lib/modules/KVER-ipfire/kernel/fs/xfs
> diff --git a/lfs/linux b/lfs/linux
> index b30a28fff..87442185a 100644
> --- a/lfs/linux
> +++ b/lfs/linux
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER         = 6.1.30
> +VER         = 6.1.37
> 
> 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 = d3c4cda0bbd978ad7e39a44e03789f38b7a48a92405312f90fd944a670ca438e1dd212af2b075820896b25405027be92071dbd24455331de742aa5c9f2ac3407
> +$(DL_FILE)_BLAKE2 = 9ea4b47123c21b658923f46d3f7d6b911f49e8616f038feefef860b3bb8756b2cbd0b097640b18333d79951b99c37dc32c1a4357263ff69641580c4d3ab4bc56
> arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
> 
> install : $(TARGET)
> -- 
> 2.38.1
>