GIT Revision: 94472718bd34ca4adb72d325d55f37bd87bfde65

GIT Branch: stable 2025-12-19 10:15:01 +0000
GIT Revision: 05e3e3d86e50004137d26dd7bddeae159fae4eae
2025-12-19 11:15:53 +01:00 · 2025-12-19 11:13:46 +01:00 · 2025-12-19 11:12:42 +01:00 · 2025-12-13 07:38:48 +01:00 · 2025-12-06 08:16:14 +01:00 · 2025-12-02 09:57:19 +01:00
45 changed files with 62093 additions and 1979 deletions
--- a/config.sh
+++ b/config.sh
@@ -1,5 +1,5 @@
 # The version of the main tarball to use
-SRCVERSION=6.17
+SRCVERSION=6.18
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=
 # enable kernel module compression
@@ -27,3 +27,5 @@ BUILD_HTML=Yes
 BUILD_PDF=No
 # Generate compile_commands.json
 GENERATE_COMPILE_COMMANDS=Yes
+# Use the new kABI tool
+USE_SUSE_KABI_TOOLS=Yes
--- a/config.tar.bz2
+++ b/config.tar.bz2
--- a/dtb-aarch64.changes
+++ b/dtb-aarch64.changes
--- a/dtb-aarch64.spec
+++ b/dtb-aarch64.spec
@@ -16,8 +16,8 @@
 #


-%define srcversion 6.17
-%define patchversion 6.17.7
+%define srcversion 6.18
+%define patchversion 6.18.2
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@@ -25,9 +25,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           dtb-aarch64
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
--- a/dtb-armv6l.changes
+++ b/dtb-armv6l.changes
--- a/dtb-armv6l.spec
+++ b/dtb-armv6l.spec
@@ -16,8 +16,8 @@
 #


-%define srcversion 6.17
-%define patchversion 6.17.7
+%define srcversion 6.18
+%define patchversion 6.18.2
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@@ -25,9 +25,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           dtb-armv6l
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
--- a/dtb-armv7l.changes
+++ b/dtb-armv7l.changes
--- a/dtb-armv7l.spec
+++ b/dtb-armv7l.spec
@@ -16,8 +16,8 @@
 #


-%define srcversion 6.17
-%define patchversion 6.17.7
+%define srcversion 6.18
+%define patchversion 6.18.2
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@@ -25,9 +25,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           dtb-armv7l
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
--- a/dtb-riscv64.changes
+++ b/dtb-riscv64.changes
--- a/dtb-riscv64.spec
+++ b/dtb-riscv64.spec
@@ -16,8 +16,8 @@
 #


-%define srcversion 6.17
-%define patchversion 6.17.7
+%define srcversion 6.18
+%define patchversion 6.18.2
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@@ -25,9 +25,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           dtb-riscv64
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -285,6 +285,33 @@ cd /boot
 %dir %{dtbdir}/sophgo
 %{dtbdir}/sophgo/*.dtb

+%package -n dtb-spacemit
+Summary:        SpacemiT based riscv64 systems
+Group:          System/Boot
+Provides:       multiversion(dtb)
+Requires(post): coreutils
+
+%description -n dtb-spacemit
+Device Tree files for SpacemiT based riscv64 systems.
+
+%post -n dtb-spacemit
+cd /boot
+# If /boot/dtb is a symlink, remove it, so that we can replace it.
+[ -d dtb ] && [ -L dtb ] && rm -f dtb
+# Unless /boot/dtb exists as real directory, create a symlink.
+[ -d dtb ] || ln -sf dtb-%kernelrelease dtb
+
+%ifarch %arm aarch64 riscv64
+%files -n dtb-spacemit -f dtb-spacemit.list
+%else
+%files -n dtb-spacemit
+%endif
+%defattr(-,root,root)
+%ghost /boot/dtb
+%dir %{dtbdir}
+%dir %{dtbdir}/spacemit
+%{dtbdir}/spacemit/*.dtb
+
 %package -n dtb-starfive
 Summary:        StarFive based riscv64 systems
 Group:          System/Boot
@@ -357,7 +384,7 @@ export DTC_FLAGS="-R 4 -p 0x1000"
 DTC_FLAGS="$DTC_FLAGS -@"

 cd $source/arch/riscv/boot/dts
-for dts in allwinner/*.dts microchip/*.dts renesas/*.dts sifive/*.dts sophgo/*.dts starfive/*.dts thead/*.dts ; do
+for dts in allwinner/*.dts microchip/*.dts renesas/*.dts sifive/*.dts sophgo/*.dts spacemit/*.dts starfive/*.dts thead/*.dts ; do
    target=${dts%*.dts}
    mkdir -p $PPDIR/$(dirname $target)
    cpp -x assembler-with-cpp -undef -D__DTS__ -nostdinc -I. -I$SRCDIR/include/ -I$SRCDIR/scripts/dtc/include-prefixes/ -P $target.dts -o $PPDIR/$target.dts
@@ -366,7 +393,7 @@ done

 %install
 cd pp
-for dts in allwinner/*.dts microchip/*.dts renesas/*.dts sifive/*.dts sophgo/*.dts starfive/*.dts thead/*.dts ; do
+for dts in allwinner/*.dts microchip/*.dts renesas/*.dts sifive/*.dts sophgo/*.dts spacemit/*.dts starfive/*.dts thead/*.dts ; do
    target=${dts%*.dts}
    install -m 755 -d %{buildroot}%{dtbdir}/$(dirname $target)
    # install -m 644 COPYING %{buildroot}%{dtbdir}/$(dirname $target)
--- a/kernel-64kb.changes
+++ b/kernel-64kb.changes
--- a/kernel-64kb.spec
+++ b/kernel-64kb.spec
@@ -17,9 +17,9 @@
 # needssslcertforbuild


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define compress_modules zstd
 %define compress_vmlinux xz
@@ -31,7 +31,7 @@
 %define supported_modules_check 0
 %define build_flavor 64kb
 %define generate_compile_commands 1
-%define use_suse_kabi_tools 0
+%define use_suse_kabi_tools 1
 %define gcc_package gcc
 %define gcc_compiler gcc

@@ -40,9 +40,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-64kb
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -79,6 +79,11 @@ BuildRequires:  dwarves >= 1.22
 BuildRequires:  %gcc_package
 # for objtool
 BuildRequires:  libelf-devel
+# part of elfutils not shipped on SLE 12
+%if 0%{?suse_version} >= 1500
+# for gendwarfksyms
+BuildRequires:  libdw-devel
+%endif
 # required for 50-check-kernel-build-id rpm check
 BuildRequires:  elfutils
 %ifarch %arm
@@ -1130,59 +1135,6 @@ accessible simultaneously from multiple nodes of a cluster.

 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files

-%package -n reiserfs-kmp-%build_flavor
-Summary:        Reiserfs kernel module
-Group:          System/Kernel
-Requires:       %name = %version-%source_rel
-Provides:       reiserfs-kmp = %version-%source_rel
-Provides:       multiversion(kernel)
-# tell weak-modules2 to ignore this package
-Provides:       kmp_in_kernel
-Requires(post): suse-module-tools >= 12.4
-%if %build_default
-%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
-Provides:       reiserfs-kmp-preempt = %version-%release
-%endif
-%endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
-
-%description -n reiserfs-kmp-%build_flavor
-The reiserfs file system is no longer supported in SLE15.  This package
-provides the reiserfs module for the installation system.
-
-%pre -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%post -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%preun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%postun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%posttrans -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES

@@ -1227,7 +1179,7 @@ awk '{
 subpackages=(
 	base
 %if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
+	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp
 %endif
 )
 for package in "${subpackages[@]}"; do
@@ -1335,14 +1287,7 @@ echo "Kernel debuginfo type: ${DEBUG_INFO_TYPE}"
 	--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 	$CONFIG_SUSE_KERNEL_RELEASED \
-	$CONFIG_SUSE_HAVE_STABLE_KABI \
-%if 0%{?__debug_package:1}
-	--enable  CONFIG_DEBUG_INFO
-%else
-	--disable CONFIG_DEBUG_INFO \
-	--disable CONFIG_DEBUG_INFO_"${DEBUG_INFO_TYPE}" \
-	--enable  CONFIG_DEBUG_INFO_NONE
-%endif
+	$CONFIG_SUSE_HAVE_STABLE_KABI

 if [ %CONFIG_MODULE_SIG = "y" ]; then
 	if [ -n "%certs" ] ; then
@@ -1471,9 +1416,11 @@ fi

 %install

+%if 0%{?__debug_package:1}
 # get rid of /usr/lib/rpm/brp-strip-debug
-# strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
+%endif
+# strip removes too much from the vmlinux ELF binary
 export STRIP_KEEP_SYMTAB='*/vmlinux*'

 # %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
--- a/kernel-default.changes
+++ b/kernel-default.changes
--- a/kernel-default.spec
+++ b/kernel-default.spec
@@ -17,9 +17,9 @@
 # needssslcertforbuild


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define compress_modules zstd
 %define compress_vmlinux xz
@@ -31,7 +31,7 @@
 %define supported_modules_check 0
 %define build_flavor default
 %define generate_compile_commands 1
-%define use_suse_kabi_tools 0
+%define use_suse_kabi_tools 1
 %define gcc_package gcc
 %define gcc_compiler gcc

@@ -40,9 +40,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-default
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -79,6 +79,11 @@ BuildRequires:  dwarves >= 1.22
 BuildRequires:  %gcc_package
 # for objtool
 BuildRequires:  libelf-devel
+# part of elfutils not shipped on SLE 12
+%if 0%{?suse_version} >= 1500
+# for gendwarfksyms
+BuildRequires:  libdw-devel
+%endif
 # required for 50-check-kernel-build-id rpm check
 BuildRequires:  elfutils
 %ifarch %arm
@@ -1238,59 +1243,6 @@ accessible simultaneously from multiple nodes of a cluster.

 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files

-%package -n reiserfs-kmp-%build_flavor
-Summary:        Reiserfs kernel module
-Group:          System/Kernel
-Requires:       %name = %version-%source_rel
-Provides:       reiserfs-kmp = %version-%source_rel
-Provides:       multiversion(kernel)
-# tell weak-modules2 to ignore this package
-Provides:       kmp_in_kernel
-Requires(post): suse-module-tools >= 12.4
-%if %build_default
-%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
-Provides:       reiserfs-kmp-preempt = %version-%release
-%endif
-%endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
-
-%description -n reiserfs-kmp-%build_flavor
-The reiserfs file system is no longer supported in SLE15.  This package
-provides the reiserfs module for the installation system.
-
-%pre -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%post -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%preun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%postun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%posttrans -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES

@@ -1335,7 +1287,7 @@ awk '{
 subpackages=(
 	base
 %if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
+	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp
 %endif
 )
 for package in "${subpackages[@]}"; do
@@ -1443,14 +1395,7 @@ echo "Kernel debuginfo type: ${DEBUG_INFO_TYPE}"
 	--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 	$CONFIG_SUSE_KERNEL_RELEASED \
-	$CONFIG_SUSE_HAVE_STABLE_KABI \
-%if 0%{?__debug_package:1}
-	--enable  CONFIG_DEBUG_INFO
-%else
-	--disable CONFIG_DEBUG_INFO \
-	--disable CONFIG_DEBUG_INFO_"${DEBUG_INFO_TYPE}" \
-	--enable  CONFIG_DEBUG_INFO_NONE
-%endif
+	$CONFIG_SUSE_HAVE_STABLE_KABI

 if [ %CONFIG_MODULE_SIG = "y" ]; then
 	if [ -n "%certs" ] ; then
@@ -1579,9 +1524,11 @@ fi

 %install

+%if 0%{?__debug_package:1}
 # get rid of /usr/lib/rpm/brp-strip-debug
-# strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
+%endif
+# strip removes too much from the vmlinux ELF binary
 export STRIP_KEEP_SYMTAB='*/vmlinux*'

 # %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@@ -16,9 +16,9 @@
 #


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define build_html 1
 %define build_pdf 0
@@ -28,9 +28,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-docs
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
--- a/kernel-kvmsmall.changes
+++ b/kernel-kvmsmall.changes
--- a/kernel-kvmsmall.spec
+++ b/kernel-kvmsmall.spec
@@ -17,9 +17,9 @@
 # needssslcertforbuild


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define compress_modules zstd
 %define compress_vmlinux xz
@@ -31,7 +31,7 @@
 %define supported_modules_check 0
 %define build_flavor kvmsmall
 %define generate_compile_commands 1
-%define use_suse_kabi_tools 0
+%define use_suse_kabi_tools 1
 %define gcc_package gcc
 %define gcc_compiler gcc

@@ -40,9 +40,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-kvmsmall
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -79,6 +79,11 @@ BuildRequires:  dwarves >= 1.22
 BuildRequires:  %gcc_package
 # for objtool
 BuildRequires:  libelf-devel
+# part of elfutils not shipped on SLE 12
+%if 0%{?suse_version} >= 1500
+# for gendwarfksyms
+BuildRequires:  libdw-devel
+%endif
 # required for 50-check-kernel-build-id rpm check
 BuildRequires:  elfutils
 %ifarch %arm
@@ -1146,59 +1151,6 @@ accessible simultaneously from multiple nodes of a cluster.

 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files

-%package -n reiserfs-kmp-%build_flavor
-Summary:        Reiserfs kernel module
-Group:          System/Kernel
-Requires:       %name = %version-%source_rel
-Provides:       reiserfs-kmp = %version-%source_rel
-Provides:       multiversion(kernel)
-# tell weak-modules2 to ignore this package
-Provides:       kmp_in_kernel
-Requires(post): suse-module-tools >= 12.4
-%if %build_default
-%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
-Provides:       reiserfs-kmp-preempt = %version-%release
-%endif
-%endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
-
-%description -n reiserfs-kmp-%build_flavor
-The reiserfs file system is no longer supported in SLE15.  This package
-provides the reiserfs module for the installation system.
-
-%pre -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%post -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%preun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%postun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%posttrans -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES

@@ -1243,7 +1195,7 @@ awk '{
 subpackages=(
 	base
 %if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
+	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp
 %endif
 )
 for package in "${subpackages[@]}"; do
@@ -1351,14 +1303,7 @@ echo "Kernel debuginfo type: ${DEBUG_INFO_TYPE}"
 	--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 	$CONFIG_SUSE_KERNEL_RELEASED \
-	$CONFIG_SUSE_HAVE_STABLE_KABI \
-%if 0%{?__debug_package:1}
-	--enable  CONFIG_DEBUG_INFO
-%else
-	--disable CONFIG_DEBUG_INFO \
-	--disable CONFIG_DEBUG_INFO_"${DEBUG_INFO_TYPE}" \
-	--enable  CONFIG_DEBUG_INFO_NONE
-%endif
+	$CONFIG_SUSE_HAVE_STABLE_KABI

 if [ %CONFIG_MODULE_SIG = "y" ]; then
 	if [ -n "%certs" ] ; then
@@ -1487,9 +1432,11 @@ fi

 %install

+%if 0%{?__debug_package:1}
 # get rid of /usr/lib/rpm/brp-strip-debug
-# strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
+%endif
+# strip removes too much from the vmlinux ELF binary
 export STRIP_KEEP_SYMTAB='*/vmlinux*'

 # %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
--- a/kernel-lpae.changes
+++ b/kernel-lpae.changes
--- a/kernel-lpae.spec
+++ b/kernel-lpae.spec
@@ -17,9 +17,9 @@
 # needssslcertforbuild


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define compress_modules zstd
 %define compress_vmlinux xz
@@ -31,7 +31,7 @@
 %define supported_modules_check 0
 %define build_flavor lpae
 %define generate_compile_commands 1
-%define use_suse_kabi_tools 0
+%define use_suse_kabi_tools 1
 %define gcc_package gcc
 %define gcc_compiler gcc

@@ -40,9 +40,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-lpae
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -79,6 +79,11 @@ BuildRequires:  dwarves >= 1.22
 BuildRequires:  %gcc_package
 # for objtool
 BuildRequires:  libelf-devel
+# part of elfutils not shipped on SLE 12
+%if 0%{?suse_version} >= 1500
+# for gendwarfksyms
+BuildRequires:  libdw-devel
+%endif
 # required for 50-check-kernel-build-id rpm check
 BuildRequires:  elfutils
 %ifarch %arm
@@ -1122,59 +1127,6 @@ accessible simultaneously from multiple nodes of a cluster.

 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files

-%package -n reiserfs-kmp-%build_flavor
-Summary:        Reiserfs kernel module
-Group:          System/Kernel
-Requires:       %name = %version-%source_rel
-Provides:       reiserfs-kmp = %version-%source_rel
-Provides:       multiversion(kernel)
-# tell weak-modules2 to ignore this package
-Provides:       kmp_in_kernel
-Requires(post): suse-module-tools >= 12.4
-%if %build_default
-%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
-Provides:       reiserfs-kmp-preempt = %version-%release
-%endif
-%endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
-
-%description -n reiserfs-kmp-%build_flavor
-The reiserfs file system is no longer supported in SLE15.  This package
-provides the reiserfs module for the installation system.
-
-%pre -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%post -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%preun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%postun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%posttrans -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES

@@ -1219,7 +1171,7 @@ awk '{
 subpackages=(
 	base
 %if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
+	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp
 %endif
 )
 for package in "${subpackages[@]}"; do
@@ -1327,14 +1279,7 @@ echo "Kernel debuginfo type: ${DEBUG_INFO_TYPE}"
 	--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 	$CONFIG_SUSE_KERNEL_RELEASED \
-	$CONFIG_SUSE_HAVE_STABLE_KABI \
-%if 0%{?__debug_package:1}
-	--enable  CONFIG_DEBUG_INFO
-%else
-	--disable CONFIG_DEBUG_INFO \
-	--disable CONFIG_DEBUG_INFO_"${DEBUG_INFO_TYPE}" \
-	--enable  CONFIG_DEBUG_INFO_NONE
-%endif
+	$CONFIG_SUSE_HAVE_STABLE_KABI

 if [ %CONFIG_MODULE_SIG = "y" ]; then
 	if [ -n "%certs" ] ; then
@@ -1463,9 +1408,11 @@ fi

 %install

+%if 0%{?__debug_package:1}
 # get rid of /usr/lib/rpm/brp-strip-debug
-# strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
+%endif
+# strip removes too much from the vmlinux ELF binary
 export STRIP_KEEP_SYMTAB='*/vmlinux*'

 # %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
--- a/kernel-obs-build.changes
+++ b/kernel-obs-build.changes
--- a/kernel-obs-build.spec
+++ b/kernel-obs-build.spec
@@ -19,7 +19,7 @@

 #!BuildIgnore: post-build-checks

-%define patchversion 6.17.7
+%define patchversion 6.18.2
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros
@@ -38,23 +38,23 @@
 %endif
 %endif
 %endif
-%global kernel_package kernel%kernel_flavor-srchash-c376041991582f38054bc5da00a7ac4d96af6692
+%global kernel_package kernel%kernel_flavor-srchash-94472718bd34ca4adb72d325d55f37bd87bfde65
 %endif
 %if 0%{?rhel_version}
 %global kernel_package kernel
 %endif

 Name:           kernel-obs-build
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
 Summary:        package kernel and initrd for OBS VM builds
 License:        GPL-2.0-only
 Group:          SLES
-Provides:       kernel-obs-build-srchash-c376041991582f38054bc5da00a7ac4d96af6692
+Provides:       kernel-obs-build-srchash-94472718bd34ca4adb72d325d55f37bd87bfde65
 BuildRequires:  coreutils
 BuildRequires:  device-mapper
 BuildRequires:  dracut
@@ -125,7 +125,7 @@ export KERNEL_MODULES="
 	xfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat
 	nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth overlay 9p 9pnet_virtio qemu_fw_cfg
 	algif_hash aegis128 xts bridge br_netfilter nf_nat nf_tables xt_conntrack iptable_nat iptable_filter
-	iso9660"
+	iso9660 xt_addrtype"

 # manually load all modules to make sure they're available
 for i in $KERNEL_MODULES; do
--- a/kernel-obs-qa.changes
+++ b/kernel-obs-qa.changes
--- a/kernel-obs-qa.spec
+++ b/kernel-obs-qa.spec
@@ -17,15 +17,15 @@
 # needsrootforbuild


-%define patchversion 6.17.7
+%define patchversion 6.18.2
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros

 Name:           kernel-obs-qa
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -36,7 +36,7 @@ BuildRequires:  kernel-default
 # kernel-obs-build must be also configured as VMinstall, but is required
 # here as well to avoid that qa and build package build parallel
 %if ! 0%{?qemu_user_space_build}
-BuildRequires:  kernel-obs-build-srchash-c376041991582f38054bc5da00a7ac4d96af6692
+BuildRequires:  kernel-obs-build-srchash-94472718bd34ca4adb72d325d55f37bd87bfde65
 %endif
 BuildRequires:  modutils
 ExclusiveArch:  aarch64 armv6hl armv7hl ppc64le riscv64 s390x x86_64
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@@ -17,9 +17,9 @@
 # needssslcertforbuild


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define compress_modules zstd
 %define compress_vmlinux xz
@@ -31,7 +31,7 @@
 %define supported_modules_check 0
 %define build_flavor pae
 %define generate_compile_commands 1
-%define use_suse_kabi_tools 0
+%define use_suse_kabi_tools 1
 %define gcc_package gcc
 %define gcc_compiler gcc

@@ -40,9 +40,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-pae
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -79,6 +79,11 @@ BuildRequires:  dwarves >= 1.22
 BuildRequires:  %gcc_package
 # for objtool
 BuildRequires:  libelf-devel
+# part of elfutils not shipped on SLE 12
+%if 0%{?suse_version} >= 1500
+# for gendwarfksyms
+BuildRequires:  libdw-devel
+%endif
 # required for 50-check-kernel-build-id rpm check
 BuildRequires:  elfutils
 %ifarch %arm
@@ -1194,59 +1199,6 @@ accessible simultaneously from multiple nodes of a cluster.

 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files

-%package -n reiserfs-kmp-%build_flavor
-Summary:        Reiserfs kernel module
-Group:          System/Kernel
-Requires:       %name = %version-%source_rel
-Provides:       reiserfs-kmp = %version-%source_rel
-Provides:       multiversion(kernel)
-# tell weak-modules2 to ignore this package
-Provides:       kmp_in_kernel
-Requires(post): suse-module-tools >= 12.4
-%if %build_default
-%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
-Provides:       reiserfs-kmp-preempt = %version-%release
-%endif
-%endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
-
-%description -n reiserfs-kmp-%build_flavor
-The reiserfs file system is no longer supported in SLE15.  This package
-provides the reiserfs module for the installation system.
-
-%pre -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%post -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%preun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%postun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%posttrans -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES

@@ -1291,7 +1243,7 @@ awk '{
 subpackages=(
 	base
 %if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
+	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp
 %endif
 )
 for package in "${subpackages[@]}"; do
@@ -1399,14 +1351,7 @@ echo "Kernel debuginfo type: ${DEBUG_INFO_TYPE}"
 	--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 	$CONFIG_SUSE_KERNEL_RELEASED \
-	$CONFIG_SUSE_HAVE_STABLE_KABI \
-%if 0%{?__debug_package:1}
-	--enable  CONFIG_DEBUG_INFO
-%else
-	--disable CONFIG_DEBUG_INFO \
-	--disable CONFIG_DEBUG_INFO_"${DEBUG_INFO_TYPE}" \
-	--enable  CONFIG_DEBUG_INFO_NONE
-%endif
+	$CONFIG_SUSE_HAVE_STABLE_KABI

 if [ %CONFIG_MODULE_SIG = "y" ]; then
 	if [ -n "%certs" ] ; then
@@ -1535,9 +1480,11 @@ fi

 %install

+%if 0%{?__debug_package:1}
 # get rid of /usr/lib/rpm/brp-strip-debug
-# strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
+%endif
+# strip removes too much from the vmlinux ELF binary
 export STRIP_KEEP_SYMTAB='*/vmlinux*'

 # %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
--- a/kernel-source.changes
+++ b/kernel-source.changes
--- a/kernel-source.spec
+++ b/kernel-source.spec
@@ -16,9 +16,9 @@
 #


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define gcc_package gcc
 %define gcc_compiler gcc
@@ -28,9 +28,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-source
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
--- a/2
+++ b/2
@@ -95,6 +95,8 @@ There is no reason to install this package.
 # strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
 export STRIP_KEEP_SYMTAB='*/vmlinux*'
+# Modules should be already signed, do not sign again (bsc#1251930)
+export BRP_PESIGN_FILES=""

 echo "%{?modules}" | tr ', ' '\n\n' > request-modules
 %scriptdir/kernel-subpackage-build %kernel_package_name %rpm_kver-%rpm_krel %package_name-%version-%release
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@@ -16,15 +16,15 @@
 #


-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}

 %include %_sourcedir/kernel-spec-macros

 Name:           kernel-syms
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@@ -17,9 +17,9 @@
 # needssslcertforbuild


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define compress_modules zstd
 %define compress_vmlinux xz
@@ -31,7 +31,7 @@
 %define supported_modules_check 0
 %define build_flavor vanilla
 %define generate_compile_commands 1
-%define use_suse_kabi_tools 0
+%define use_suse_kabi_tools 1
 %define gcc_package gcc
 %define gcc_compiler gcc

@@ -40,9 +40,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-vanilla
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -79,6 +79,11 @@ BuildRequires:  dwarves >= 1.22
 BuildRequires:  %gcc_package
 # for objtool
 BuildRequires:  libelf-devel
+# part of elfutils not shipped on SLE 12
+%if 0%{?suse_version} >= 1500
+# for gendwarfksyms
+BuildRequires:  libdw-devel
+%endif
 # required for 50-check-kernel-build-id rpm check
 BuildRequires:  elfutils
 %ifarch %arm
@@ -1118,59 +1123,6 @@ accessible simultaneously from multiple nodes of a cluster.

 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files

-%package -n reiserfs-kmp-%build_flavor
-Summary:        Reiserfs kernel module
-Group:          System/Kernel
-Requires:       %name = %version-%source_rel
-Provides:       reiserfs-kmp = %version-%source_rel
-Provides:       multiversion(kernel)
-# tell weak-modules2 to ignore this package
-Provides:       kmp_in_kernel
-Requires(post): suse-module-tools >= 12.4
-%if %build_default
-%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
-Provides:       reiserfs-kmp-preempt = %version-%release
-%endif
-%endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
-
-%description -n reiserfs-kmp-%build_flavor
-The reiserfs file system is no longer supported in SLE15.  This package
-provides the reiserfs module for the installation system.
-
-%pre -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%post -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%preun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%postun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%posttrans -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES

@@ -1215,7 +1167,7 @@ awk '{
 subpackages=(
 	base
 %if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
+	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp
 %endif
 )
 for package in "${subpackages[@]}"; do
@@ -1323,14 +1275,7 @@ echo "Kernel debuginfo type: ${DEBUG_INFO_TYPE}"
 	--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 	$CONFIG_SUSE_KERNEL_RELEASED \
-	$CONFIG_SUSE_HAVE_STABLE_KABI \
-%if 0%{?__debug_package:1}
-	--enable  CONFIG_DEBUG_INFO
-%else
-	--disable CONFIG_DEBUG_INFO \
-	--disable CONFIG_DEBUG_INFO_"${DEBUG_INFO_TYPE}" \
-	--enable  CONFIG_DEBUG_INFO_NONE
-%endif
+	$CONFIG_SUSE_HAVE_STABLE_KABI

 if [ %CONFIG_MODULE_SIG = "y" ]; then
 	if [ -n "%certs" ] ; then
@@ -1459,9 +1404,11 @@ fi

 %install

+%if 0%{?__debug_package:1}
 # get rid of /usr/lib/rpm/brp-strip-debug
-# strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
+%endif
+# strip removes too much from the vmlinux ELF binary
 export STRIP_KEEP_SYMTAB='*/vmlinux*'

 # %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
--- a/kernel-zfcpdump.changes
+++ b/kernel-zfcpdump.changes
--- a/kernel-zfcpdump.spec
+++ b/kernel-zfcpdump.spec
@@ -17,9 +17,9 @@
 # needssslcertforbuild


-%define srcversion 6.17
-%define patchversion 6.17.7
-%define git_commit c376041991582f38054bc5da00a7ac4d96af6692
+%define srcversion 6.18
+%define patchversion 6.18.2
+%define git_commit 94472718bd34ca4adb72d325d55f37bd87bfde65
 %define variant %{nil}
 %define compress_modules zstd
 %define compress_vmlinux xz
@@ -31,7 +31,7 @@
 %define supported_modules_check 0
 %define build_flavor zfcpdump
 %define generate_compile_commands 1
-%define use_suse_kabi_tools 0
+%define use_suse_kabi_tools 1
 %define gcc_package gcc
 %define gcc_compiler gcc

@@ -40,9 +40,9 @@
 %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,arch-symbols,check-module-license,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})

 Name:           kernel-zfcpdump
-Version:        6.17.7
+Version:        6.18.2
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gc376041
+Release:        <RELEASE>.g9447271
 %else
 Release:        0
 %endif
@@ -79,6 +79,11 @@ BuildRequires:  dwarves >= 1.22
 BuildRequires:  %gcc_package
 # for objtool
 BuildRequires:  libelf-devel
+# part of elfutils not shipped on SLE 12
+%if 0%{?suse_version} >= 1500
+# for gendwarfksyms
+BuildRequires:  libdw-devel
+%endif
 # required for 50-check-kernel-build-id rpm check
 BuildRequires:  elfutils
 %ifarch %arm
@@ -1130,59 +1135,6 @@ accessible simultaneously from multiple nodes of a cluster.

 %files -n ocfs2-kmp-%build_flavor -f ocfs2-kmp.files

-%package -n reiserfs-kmp-%build_flavor
-Summary:        Reiserfs kernel module
-Group:          System/Kernel
-Requires:       %name = %version-%source_rel
-Provides:       reiserfs-kmp = %version-%source_rel
-Provides:       multiversion(kernel)
-# tell weak-modules2 to ignore this package
-Provides:       kmp_in_kernel
-Requires(post): suse-module-tools >= 12.4
-%if %build_default
-%if "%CONFIG_PREEMPT_DYNAMIC" == "y"
-Provides:       reiserfs-kmp-preempt = %version-%release
-%endif
-%endif
-Enhances:	%name
-Supplements:	packageand(%name:reiserfs-kmp-%build_flavor)
-
-%description -n reiserfs-kmp-%build_flavor
-The reiserfs file system is no longer supported in SLE15.  This package
-provides the reiserfs module for the installation system.
-
-%pre -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-pre --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%post -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-post --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%preun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-preun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%postun -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-postun --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%posttrans -n reiserfs-kmp-%build_flavor
-%run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/inkmp-posttrans --name "reiserfs-kmp-%build_flavor" \
-  --version "%version" --release "%release" --kernelrelease "%kernelrelease" \
-  --image "%image" --flavor "%build_flavor" --variant "%variant" \
-  --usrmerged "%{usrmerged}" --certs "%certs" "$@"
-
-%files -n reiserfs-kmp-%build_flavor -f reiserfs-kmp.files
-
 %endif # %CONFIG_SUSE_KERNEL_SUPPORTED
 %endif # %CONFIG_MODULES

@@ -1227,7 +1179,7 @@ awk '{
 subpackages=(
 	base
 %if "%CONFIG_SUSE_KERNEL_SUPPORTED" == "y"
-	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp reiserfs-kmp
+	cluster-md-kmp dlm-kmp gfs2-kmp kselftests-kmp ocfs2-kmp
 %endif
 )
 for package in "${subpackages[@]}"; do
@@ -1335,14 +1287,7 @@ echo "Kernel debuginfo type: ${DEBUG_INFO_TYPE}"
 	--set-str CONFIG_LOCALVERSION -%source_rel-%build_flavor \
 	--enable  CONFIG_SUSE_KERNEL \
 	$CONFIG_SUSE_KERNEL_RELEASED \
-	$CONFIG_SUSE_HAVE_STABLE_KABI \
-%if 0%{?__debug_package:1}
-	--enable  CONFIG_DEBUG_INFO
-%else
-	--disable CONFIG_DEBUG_INFO \
-	--disable CONFIG_DEBUG_INFO_"${DEBUG_INFO_TYPE}" \
-	--enable  CONFIG_DEBUG_INFO_NONE
-%endif
+	$CONFIG_SUSE_HAVE_STABLE_KABI

 if [ %CONFIG_MODULE_SIG = "y" ]; then
 	if [ -n "%certs" ] ; then
@@ -1471,9 +1416,11 @@ fi

 %install

+%if 0%{?__debug_package:1}
 # get rid of /usr/lib/rpm/brp-strip-debug
-# strip removes too much from the vmlinux ELF binary
 export NO_BRP_STRIP_DEBUG=true
+%endif
+# strip removes too much from the vmlinux ELF binary
 export STRIP_KEEP_SYMTAB='*/vmlinux*'

 # %kernel_module_directory/%kernelrelease-%build_flavor/source points to the source
--- a/linux-6.17.tar.sign
+++ b/linux-6.17.tar.sign
@@ -1,19 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Comment: This signature is for the .tar version of the archive
-Comment: git archive --format tar --prefix=linux-6.17/ v6.17
-Comment: git version 2.51.0
-
-iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmjaF/kACgkQONu9yGCS
-aT6G7Q/+MfjNnvqCtqjJ9/K4C09+eqt2WOI7cYXfziT74zNYXgRo2/xiJ0hQv20J
-2PjQO9gKLsz3JdWvY56joe2OpyL9VqPAMH+RDcdfj07ySpz7MvwQQ86ii1BqFbxg
-bmlud5d47BDI2fyAVeKcIyH0mm/PFblR1SR07ruAcDDAH/clYVOqiiF2w5Z2LjnJ
-s6kRX2BMmEAbHvX6PHvP+8b/GHxr7RImSqO5g2pKT6PC++myUczJ3ffiMPwL1R1B
-cyAfhnJ5YBcEV/yusHx0QTemnZOmGyT63sWJaB4lTaxk38FB1WN1CkVm9He/cjEA
-3TTfBTSEEdQJXVRtPGQTz6odY3wx8diltfNMhy+NIRdM9rk7rM/QTZ+i7eKzGV4Y
-N3Cn1YnSVOxK4cEEwUg2vh2k1vHhCzwzOkY4rrWVNAXtkkBFNX5jzs4HPfMnsXX9
-lDb5vJQkm1ipKYTHpk/xtvaXYCnxumzb9sCx11jFYrKWU8kG4Gp/ZFcd+duvaQTX
-yXUBoh2AMypVDZFy9KNBdzj8jlC4kCgNe+9W60Fl5rFKzYevnlGENZldgYc+1Xmk
-afupwrS7DoW+Zf0EvdzNTOXRd7pHFNtB2kOa91mOBpnCRO8Qsi570IcfnMPkNRTr
-xQ2JxkohlIFQ14KvEADVziTnljs7hp/cPWbLJm7C4vwpTcJgjQw=
-=Lc8u
-----END PGP SIGNATURE-----
--- a/linux-6.17.tar.xz
+++ b/linux-6.17.tar.xz
--- a/linux-6.18.tar.sign
+++ b/linux-6.18.tar.sign
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: This signature is for the .tar version of the archive
+Comment: git archive --format tar --prefix=linux-6.18/ v6.18
+Comment: git version 2.52.0
+
+iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmktKMYACgkQONu9yGCS
+aT4Hgg/+M5KSFON3IFgCtolH4vP13nzEvFRBAAJ2hZdkluN65tWxPzLnBXvCecfj
+wep1DXOBS+8GnNfoF1d5S1ZRpBj3gDdh3BRQvowmx1rRXf68PCW7DuVCgO/rs/jS
+mtft0v/9z+NHY9tQkpgiFqRQaodCy7CIk2wlHE7tgiU5NAxrYEJgzKCdgJ4meeNp
+Y98A1EXzaDV7GRrHjlV2FrredPEpEse/f7XbqKaDKyx5gutQSiL59mLAoZ10jlIr
+A8oQJLZpA68fL4I18H1wwviuvqeGkvZO43RfzosUY3p6FJjU6DCWAWXqGo9x+hKq
+OfU6EYPcMyBX5jVsMaWNgx/wF7fR+jCMnr2q65kxSA3FYaCgy68UgX3vd8sKMlAI
+DudFDGujTIYoaq5hSdP3QiDKv+MJ5ToRZ/A6F16FXkbfi3bip9Na2QlHMQlVNFLK
+uXwWqnw3SFWqq1TOoNOv1AjGJCwX/IU2rXbYQQ6XS3+Vj2zSU32HaoEvXQIr7IAv
+iX+TjkSxj4Gb8PRtYnlekJ1d9OxuarSzagw9FBXITP3m53pAOtjzsg08ZzFaYlju
+wEH7iWeAj2YKGNZuHdgXsExahHuZDBV9gDSwKxjrSDtGwDrHvi1qUU+ge33LF7j2
+LZFAzg93Ua/YjlNSsCbeQR0199wPpoAkeStoZa5INabdBKNbZKI=
+=2moX
+-----END PGP SIGNATURE-----
--- a/linux-6.18.tar.xz
+++ b/linux-6.18.tar.xz
--- a/patches.kernel.org.tar.bz2
+++ b/patches.kernel.org.tar.bz2
--- a/patches.rpmify.tar.bz2
+++ b/patches.rpmify.tar.bz2
--- a/patches.suse.tar.bz2
+++ b/patches.suse.tar.bz2
--- a/series.conf
+++ b/series.conf
--- a/4
+++ b/4
@@ -1,3 +1,3 @@
-2025-11-03 08:48:07 +0000
-GIT Revision: c376041991582f38054bc5da00a7ac4d96af6692
+2025-12-19 10:15:01 +0000
+GIT Revision: 94472718bd34ca4adb72d325d55f37bd87bfde65
 GIT Branch: stable
--- a/supported.conf
+++ b/supported.conf
@@ -31,7 +31,6 @@
 +ocfs2-kmp	fs/ocfs2/ocfs2_stack_o2cb					# fate#319339
 +ocfs2-kmp	fs/ocfs2/ocfs2_stack_user					# fate#319339
 +ocfs2-kmp	fs/ocfs2/ocfs2_stackglue					# fate#319339
-+reiserfs-kmp	fs/reiserfs/reiserfs						# ReiserFS journaled filesystem
 		arch/arm64/crypto/aes-arm64
 		arch/arm64/crypto/aes-ce-blk
 		arch/arm64/crypto/aes-ce-ccm
@@ -3709,7 +3708,6 @@
 		fs/quota/quota_tree
 		fs/quota/quota_v1
 		fs/quota/quota_v2
-		fs/reiserfs/reiserfs
 -		fs/romfs/romfs
 		fs/squashfs/squashfs
 -		fs/sysv/sysv
Author	SHA256	Message	Date
Jiri Slaby	74ff18fc0d	GIT Revision: 94472718bd34ca4adb72d325d55f37bd87bfde65 GIT Branch: stable 2025-12-19 10:15:01 +0000	2025-12-19 11:15:53 +01:00
Jiri Slaby	ce7c391b8e	GIT Revision: 05e3e3d86e50004137d26dd7bddeae159fae4eae GIT Branch: stable 2025-12-19 10:09:29 +0000	2025-12-19 11:13:46 +01:00
Jiri Slaby	172a629344	GIT Revision: 05e3e3d86e50004137d26dd7bddeae159fae4eae GIT Branch: stable 2025-12-19 10:09:29 +0000	2025-12-19 11:12:42 +01:00
Jiri Slaby	50ddf54bf3	GIT Revision: ffe6340b267ac4e36a25057fcb92f9a0c0f7d2b4 GIT Branch: stable 2025-12-13 06:33:53 +0000	2025-12-13 07:38:48 +01:00
Jiri Slaby	f8c44788e0	GIT Revision: 371bdaf6331fcbaa19c6f7c0aa6f3af5a36f7e2b GIT Branch: stable 2025-12-06 07:14:55 +0000	2025-12-06 08:16:14 +01:00
Jiri Slaby	496c6046fd	GIT Revision: 6ce3f150389ee2831c4c0047296d6b64fc9054da GIT Branch: stable 2025-12-02 08:54:32 +0000	2025-12-02 09:57:19 +01:00
Jiri Slaby	46d95a93ba	GIT Revision: d7c93ef8354904ef83c89b0a4072995b0186c13f GIT Branch: stable 2025-12-01 06:36:49 +0000	2025-12-01 07:48:27 +01:00
Jiri Slaby	3dcc6ae89f	GIT Revision: d7c93ef8354904ef83c89b0a4072995b0186c13f GIT Branch: stable 2025-12-01 06:36:49 +0000	2025-12-01 07:47:36 +01:00
Jiri Slaby	8c24d58dd0	GIT Revision: a337d5c329f9879e25900ea7d0cab91f606a5847 GIT Branch: stable 2025-11-27 06:58:56 +0000	2025-11-27 08:02:48 +01:00
Jiri Slaby	204319ccaf	GIT Revision: 17f6a20d7e47cb61cff6e4d7b171fd88a757883d GIT Branch: stable 2025-11-24 17:13:39 +0000	2025-11-24 18:14:40 +01:00
Jiri Slaby	f7a97ce9ed	GIT Revision: 5d803dee3374c5c7045972dd844aaf3d08c55fc1 GIT Branch: stable 2025-11-20 15:10:21 +0000	2025-11-20 16:17:01 +01:00
Jiri Slaby	1466f13f2b	GIT Revision: 0a31dc366f7b12fd7865963073808619e2de6b07 GIT Branch: stable 2025-11-19 07:27:20 +0000	2025-11-19 08:28:34 +01:00
Jiri Slaby	7c9a862800	GIT Revision: 051eaf7dc4e40c744076f7f542b701ebad75cfa3 GIT Branch: stable 2025-11-14 06:49:01 +0000	2025-11-14 09:34:17 +01:00
Jiri Slaby	8fb9211937	GIT Revision: 7992e49e4adcd3612d030cea2f869ddf8b7b67da GIT Branch: rc 2025-11-11 07:20:46 +0000	2025-11-14 09:28:15 +01:00