Sync from SUSE:ALP:Source:Standard:1.0 kernel-source-rt revision c718de4fad571f649c00551a335bbd18

README.SUSE

@@ -187,8 +187,17 @@ will report one of the following:
 * third-party support: "supported: external",
 * unsupported modules: no supported tag.
 
-At runtime, the setting of the "unsupported" kernel command line parameter and
+At runtime, the support status of a module can be obtained by reading
-`/proc/sys/kernel/unsupported` determines whether unsupported modules can be
+`/sys/module/$MODULE/supported`.
+
+Note that this information is available only if the module was not built
+directly into the kernel. Builtin modules are implicitly supported.
+
+The aggregated support status for the entire kernel can be inspected by reading
+`/sys/kernel/supported`. The value is also included in Oopses.
+
+The setting of the "unsupported" kernel command line parameter and
+`/proc/sys/kernel/unsupported` controls whether unsupported modules can be
 loaded or not, and whether or not loading an unsupported module causes a warning
 in the system log:
 
@@ -196,9 +205,9 @@ in the system log:
 * 1 = warn when loading unsupported modules,
 * 2 = don't warn.
 
-Irrespective of this setting, loading an externally supported or unsupported
+Irrespective of this setting, loading an unsupported module sets a kernel taint
-module both set a kernel taint flag. The taint flags are included in Oopses. The
+flag. The taint status of the kernel can be inspected in
-taint status of the kernel can be inspected in `/proc/sys/kernel/tainted`.
+`/proc/sys/kernel/tainted`. The taint flags are also included in Oopses.
 Relevant bits have the following meaning:
 
 | Bit | Log |     Number | Reason that got the kernel tainted                 |
@@ -209,7 +218,9 @@ Relevant bits have the following meaning:
 |  16 | ␣/X |      65536 | module with third-party support was loaded         |
 |  31 | ␣/N | 2147483648 | unsupported module was loaded                      |
 
-Bits 16 and 31 are specific to the SUSE kernels.
+Bits 16 and 31 are specific to the SUSE kernels. Since SLE15-SP6, loading an
+externally supported module does not taint the kernel, but bit 16 (X) is still
+tracked per module and can be read in `/sys/module/$MODULE/taint`.
 
 Out-of-tree modules do not have the supported flag set by default; that
 is, they are marked as unsupported. For building externally supported

check-for-config-changes

@@ -15,6 +15,7 @@ declare -a IGNORED_CONFIGS_RE=(
 	'CC_VERSION_TEXT'
 	'DYNAMIC_SIGFRAME'
 	'FTRACE_MCOUNT_USE_[A-Z_]*'
+	'GCC_ASM_GOTO_OUTPUT_WORKAROUND'
 	'GCC_VERSION'
 	'G*CC[0-9]*_NO_[A-Z_]*'
 	'HAVE_[A-Z]*_COMPILER'

compute-PATCHVERSION.sh

@@ -64,13 +64,13 @@ done >"$series" < <($(dirname $0)/guards $EXTRA_SYMBOLS <series.conf)
 
 # Parse all the changes to KERNELRELEASE out of all patches and
 # convert them to shell code that can be evaluated. Evaluate it.
-eval "$(
+eval "$( {
     <"$series" xargs awk '
     /^--- |^\+\+\+ / \
 	{ M = match($2, /^[^\/]+\/Makefile( \t|$)/) }
     M && /^+(VERSION|PATCHLEVEL|SUBLEVEL|EXTRAVERSION)/ \
 	{ print }
-    ' \
+    ' || echo exit 1 ; } \
     | sed -e 's,^+,,' -e 's, *= *\(.*\),="\1",'
 )"
 

dtb.spec.in.in

@@ -35,16 +35,19 @@ Summary:        Device Tree files for $MACHINES
 License:        GPL-2.0-only
 Group:          System/Boot
 URL:            https://www.kernel.org/
+BuildRequires:  cpp
+BuildRequires:  dtc >= 1.4.3
+BuildRequires:  xz
 %if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
 $ARCH_RESTRICTIONS
 %else
 ExclusiveArch:  do_not_build
 %endif
-BuildRequires:  cpp
+
-BuildRequires:  dtc >= 1.4.3
+%define dtbdir /boot/dtb-%kernelrelease
-BuildRequires:  xz
+
-Requires:       kernel = %version
 @SOURCES@
+Requires:       kernel = %version
 
 %description
 Device Tree files for $MACHINES.
@@ -57,7 +60,6 @@ $SUBPKG_DESC
 cd linux-%srcversion
 %_sourcedir/apply-patches %_sourcedir/series.conf ..
 
-
 %build
 source=linux-%srcversion
 cp $source/COPYING .
@@ -75,10 +77,7 @@ for dts in $ALL_SUPPORTED_DTB; do
     dtc $DTC_FLAGS -I dts -O dtb -i ./$(dirname $target) -o $PPDIR/$target.dtb $PPDIR/$target.dts
 done
 
-%define dtbdir /boot/dtb-%kernelrelease
-
 %install
-
 cd pp
 for dts in $ALL_SUPPORTED_DTB; do
     target=${dts%*.dts}
@@ -95,6 +94,4 @@ for dts in $ALL_SUPPORTED_DTB; do
 done
 cd -
 
-$SUBPKG_POST
-$SUBPKG_FILES
 %changelog

kernel-docs.spec.in

@@ -28,15 +28,16 @@
 %(chmod +x %_sourcedir/{@SCRIPTS@})
 
 Name:           kernel-docs@VARIANT@
-Summary:        Kernel Documentation
-License:        GPL-2.0-only
-Group:          Documentation/Man
 Version:        @RPMVERSION@
 %if 0%{?is_kotd}
 Release:        <RELEASE>.g@COMMIT@
 %else
 Release:        @RELEASE@
 %endif
+Summary:        Kernel Documentation
+License:        GPL-2.0-only
+Group:          Documentation/Man
+URL:            https://www.kernel.org/
 %if 0%{?suse_version} > 1500 || 0%{?sle_version} > 150300
 BuildRequires:  bash-sh
 %endif
@@ -83,21 +84,29 @@ BuildRequires:  texlive-xetex
 BuildRequires:  texlive-zapfding
 %endif
 %endif
-URL:            https://www.kernel.org/
-Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-%git_commit
 %if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
 BuildArch:      noarch
 %else
 ExclusiveArch:  do_not_build
 %endif
 @SOURCES@
+Provides:       %name = %version-%source_rel
+Provides:       %name-srchash-%git_commit
 
 %description
 A few basic documents from the current kernel sources.
 
 %source_timestamp
 
+%files
+%if 0%{?suse_version} && 0%{?suse_version} < 1500
+%doc COPYING
+%else
+%license COPYING
+%endif
+%doc CREDITS MAINTAINERS README
+%doc old_changelog.txt
+
 %if %build_pdf
 %package pdf
 Summary:        Kernel Documentation (PDF)
@@ -107,6 +116,11 @@ Group:          Documentation/Other
 These are PDF documents built from the current kernel sources.
 
 %source_timestamp
+
+%files pdf
+%dir %{_datadir}/doc/kernel
+%docdir %{_datadir}/doc/kernel/pdf
+%{_datadir}/doc/kernel/pdf
 %endif
 
 %if %build_html
@@ -118,6 +132,11 @@ Group:          Documentation/HTML
 These are HTML documents built from the current kernel sources.
 
 %source_timestamp
+
+%files html
+%dir %{_datadir}/doc/kernel
+%docdir %{_datadir}/doc/kernel/html
+%{_datadir}/doc/kernel/html
 %endif
 
 %prep
@@ -161,27 +180,4 @@ for i in pdf/Documentation/output/latex/*.pdf; do
 done
 %endif
 
-%files
-%if 0%{?suse_version} && 0%{?suse_version} < 1500
-%doc COPYING
-%else
-%license COPYING
-%endif
-%doc CREDITS MAINTAINERS README
-%doc old_changelog.txt
-
-%if %build_pdf
-%files pdf
-%dir %{_datadir}/doc/kernel
-%docdir %{_datadir}/doc/kernel/pdf
-%{_datadir}/doc/kernel/pdf
-%endif
-
-%if %build_html
-%files html
-%dir %{_datadir}/doc/kernel
-%docdir %{_datadir}/doc/kernel/html
-%{_datadir}/doc/kernel/html
-%endif
-
 %changelog

kernel-module-subpackage

@@ -73,27 +73,27 @@ END		{ exit(! good) }
 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-pre --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
-  --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
+  --flavor "%1" --usrmerged "%{usrmerged}" "$@"
 %post -n %{-n*}-kmp-%1
 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-post --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
-  --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
+  --flavor "%1" --usrmerged "%{usrmerged}" "$@"
 %preun -n %{-n*}-kmp-%1
 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-preun --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
-  --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
+  --flavor "%1" --usrmerged "%{usrmerged}" "$@"
 %postun -n %{-n*}-kmp-%1
 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-postun --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
-  --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
+  --flavor "%1" --usrmerged "%{usrmerged}" "$@"
 %posttrans -n %{-n*}-kmp-%1
 %{-b:KMP_NEEDS_MKINITRD=1; export KMP_NEEDS_MKINITRD}
 %run_if_exists /usr/lib/module-init-tools/kernel-scriptlets/kmp-posttrans --name "%{-n*}-kmp-%1" \
   --version "%_this_kmp_version" --release "%{-r*}" --kernelrelease "%2" \
-  --flavor "%1" --usrmerged "0%{?usrmerged}" "$@"
+  --flavor "%1" --usrmerged "%{usrmerged}" "$@"
 %files -n %{-n*}-kmp-%1
 %{-f:%{expand:%(cd %_sourcedir; cat %{-f*})}}
 %{!-f:%defattr (-,root,root)}

kernel-obs-build.spec.in

@@ -24,51 +24,49 @@
 
 %include %_sourcedir/kernel-spec-macros
 
-Name:           kernel-obs-build
-BuildRequires:  coreutils
-BuildRequires:  device-mapper
-BuildRequires:  util-linux
-
 %if 0%{?suse_version}
 %if "@OBS_BUILD_VARIANT@"
-%define kernel_flavor @OBS_BUILD_VARIANT@
+%global kernel_flavor @OBS_BUILD_VARIANT@
 %else
 %ifarch %ix86
-%define kernel_flavor -pae
+%global kernel_flavor -pae
 %else
 %ifarch armv7l armv7hl
-%define kernel_flavor -lpae
+%global kernel_flavor -lpae
 %else
-%define kernel_flavor -default
+%global kernel_flavor -default
 %endif
 %endif
 %endif
+%global kernel_package kernel%kernel_flavor-srchash-@COMMIT_FULL@
 %endif
-BuildRequires:  kernel%kernel_flavor-srchash-@COMMIT_FULL@
-
 %if 0%{?rhel_version}
-BuildRequires:  kernel
+%global kernel_package kernel
-%define kernel_flavor ""
 %endif
 
-%if ! 0%{?is_kotd} || %{?is_kotd_qa}%{!?is_kotd_qa:0}
+Name:           kernel-obs-build
-ExclusiveArch:  @ARCHS@
-%else
-ExclusiveArch:  do_not_build
-%endif
-BuildRequires:  dracut
-Summary:        package kernel and initrd for OBS VM builds
-License:        GPL-2.0-only
-Group:          SLES
 Version:        @RPMVERSION@
 %if 0%{?is_kotd}
 Release:        <RELEASE>.g@COMMIT@
 %else
 Release:        @RELEASE@
 %endif
+Summary:        package kernel and initrd for OBS VM builds
+License:        GPL-2.0-only
+Group:          SLES
+BuildRequires:  coreutils
+BuildRequires:  device-mapper
+BuildRequires:  dracut
+BuildRequires:  %kernel_package
+BuildRequires:  util-linux
 %if 0%{?suse_version} > 1550 || 0%{?sle_version} > 150200
 BuildRequires:  zstd
 %endif
+%if ! 0%{?is_kotd} || %{?is_kotd_qa}%{!?is_kotd_qa:0}
+ExclusiveArch:  @ARCHS@
+%else
+ExclusiveArch:  do_not_build
+%endif
 
 %description
 This package is repackaging already compiled kernels to make them usable
@@ -76,6 +74,13 @@ inside of Open Build Service (OBS) VM builds. An initrd with some basic
 kernel modules is generated as well, but further kernel modules can be
 loaded during build when installing the kernel package.
 
+%files
+/.build.cmdline.*
+/.build.console.*
+/.build.hostarch.*
+/.build.initrd.*
+/.build.kernel.*
+
 %prep
 
 %build
@@ -173,11 +178,4 @@ fi
 #see obs-build commit e47399d738e51
 uname -m > %{buildroot}/.build.hostarch.kvm
 
-%files
-/.build.cmdline.*
-/.build.console.*
-/.build.hostarch.*
-/.build.initrd.*
-/.build.kernel.*
-
 %changelog

kernel-obs-qa.spec.in

@@ -23,6 +23,15 @@
 %include %_sourcedir/kernel-spec-macros
 
 Name:           kernel-obs-qa
+Version:        @RPMVERSION@
+%if 0%{?is_kotd}
+Release:        <RELEASE>.g@COMMIT@
+%else
+Release:        @RELEASE@
+%endif
+Summary:        Basic QA tests for the kernel
+License:        GPL-2.0-only
+Group:          SLES
 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
@@ -33,20 +42,14 @@ ExclusiveArch:  @ARCHS@
 %else
 ExclusiveArch:  do_not_build
 %endif
-Summary:        Basic QA tests for the kernel
-License:        GPL-2.0-only
-Group:          SLES
-Version:        @RPMVERSION@
-%if 0%{?is_kotd}
-Release:        <RELEASE>.g@COMMIT@
-%else
-Release:        @RELEASE@
-%endif
 
 %description
 This package is using the kernel compiled within Open Build Service(OBS)
 projects and runs basic tests.
 
+%files
+/usr/share/%name
+
 %prep
 
 %build
@@ -70,7 +73,4 @@ fi
 mkdir -p %{buildroot}/usr/share/%name
 touch %{buildroot}/usr/share/%name/logfile
 
-%files
-/usr/share/%name
-
 %changelog

kernel-source-rt.spec

@@ -18,22 +18,17 @@
 
 %define srcversion 6.4
 %define patchversion 6.4.0
-%define git_commit 923c0927ebd1514413e0ed08eef3d8f392b3a46f
+%define git_commit 0d817874d18eca2fc379364350f5d8f656a563b1
 %define variant -rt%{nil}
 
 %include %_sourcedir/kernel-spec-macros
 
-%define src_install_dir usr/src/linux-%kernelrelease%variant
+%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
-
-# if undefined use legacy location of before SLE15
-%if %{undefined _rpmmacrodir}
-%define _rpmmacrodir /etc/rpm
-%endif
 
 Name:           kernel-source-rt
 Version:        6.4.0
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g923c092
+Release:        <RELEASE>.g0d81787
 %else
 Release:        0
 %endif
@@ -48,7 +43,20 @@ BuildRequires:  bash-sh
 BuildRequires:  coreutils
 BuildRequires:  fdupes
 BuildRequires:  sed
-Requires(post): coreutils sed
+%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
+BuildArch:      noarch
+%else
+ExclusiveArch:  do_not_build
+%endif
+Prefix:         /usr/src
+
+%define src_install_dir usr/src/linux-%kernelrelease%variant
+
+# if undefined use legacy location of before SLE15
+%if %{undefined _rpmmacrodir}
+%define _rpmmacrodir /etc/rpm
+%endif
+
 Source0:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.xz
 %if "https://www.kernel.org/pub/linux/kernel/v6.x/" != ""
 Source1:        https://www.kernel.org/pub/linux/kernel/v6.x/linux-%srcversion.tar.sign
@@ -122,12 +130,7 @@ Source113:      patches.kabi.tar.bz2
 Source114:      patches.drm.tar.bz2
 Source120:      kabi.tar.bz2
 Source121:      sysctl.tar.bz2
-%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
+Requires(post): coreutils sed
-BuildArch:      noarch
-%else
-ExclusiveArch:  do_not_build
-%endif
-Prefix:         /usr/src
 # Source is only complete with devel files.
 Requires:       kernel-devel%variant = %version-%source_rel
 Provides:       %name = %version-%source_rel
@@ -150,8 +153,6 @@ Recommends:     kernel-install-tools
 %endif
 %obsolete_rebuilds %name
 
-%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb,check-module-license,klp-symbols,splitflist,mergedep,moddep,modflist,kernel-subpackage-build})
-
 # Force bzip2 instead of lzma compression to
 # 1) allow install on older dist versions, and
 # 2) decrease build times (bsc#962356 boo#1175882)
@@ -166,8 +167,15 @@ Linux kernel sources with many fixes and improvements.
 
 
 %source_timestamp
+
+%post
+%relink_function
+
+relink linux-%kernelrelease%variant /usr/src/linux%variant
+
+%files -f nondevel.files
+
 %package -n kernel-devel%variant
-%obsolete_rebuilds kernel-devel%variant
 Summary:        Development files needed for building kernel modules
 Group:          Development/Sources
 AutoReqProv:    off
@@ -175,13 +183,24 @@ Provides:       kernel-devel%variant = %version-%source_rel
 Provides:       multiversion(kernel)
 Requires:       kernel-macros
 Requires(post): coreutils
+%obsolete_rebuilds kernel-devel%variant
 
 %description -n kernel-devel%variant
 Kernel-level headers and Makefiles required for development of
 external kernel modules.
 
+
 %source_timestamp
 
+%post -n kernel-devel%variant
+%relink_function
+
+relink linux-%kernelrelease%variant /usr/src/linux%variant
+
+%files -n kernel-devel%variant -f devel.files
+%ghost /usr/src/linux%variant
+%doc /usr/share/doc/packages/*
+
 # Note: The kernel-macros package intentionally does not provide
 # multiversion(kernel) nor is its name decorated with the variant (-rt)
 %package -n kernel-macros
@@ -192,8 +211,17 @@ Provides:       kernel-subpackage-macros
 %description -n kernel-macros
 This package provides the rpm macros and templates for Kernel Module Packages
 
+
 %source_timestamp
 
+%if "%variant" == ""
+%files -n kernel-macros
+%{_rpmmacrodir}/macros.kernel-source
+/usr/lib/rpm/kernel-*-subpackage
+%dir /usr/lib/rpm/kernel
+/usr/lib/rpm/kernel/*
+%endif
+
 %package vanilla
 %obsolete_rebuilds %name-vanilla
 Summary:        Vanilla Linux kernel sources with minor build fixes
@@ -213,6 +241,11 @@ Vanilla Linux kernel sources with minor build fixes.
 
 %source_timestamp
 
+%if %do_vanilla
+%files vanilla
+/usr/src/linux-%kernelrelease-vanilla
+%endif
+
 %prep
 
 echo "Symbol(s): %symbols"
@@ -295,35 +328,4 @@ done
 ts="$(head -n1 %_sourcedir/source-timestamp)"
 find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
 
-%post
-%relink_function
-
-relink linux-%kernelrelease%variant /usr/src/linux%variant
-
-%post -n kernel-devel%variant
-%relink_function
-
-relink linux-%kernelrelease%variant /usr/src/linux%variant
-
-%files -f nondevel.files
-
-%files -n kernel-devel%variant -f devel.files
-%ghost /usr/src/linux%variant
-%doc /usr/share/doc/packages/*
-
-%if "%variant" == ""
-%files -n kernel-macros
-%{_rpmmacrodir}/macros.kernel-source
-/usr/lib/rpm/kernel-*-subpackage
-%dir /usr/lib/rpm/kernel
-/usr/lib/rpm/kernel/*
-%endif
-
-
-%if %do_vanilla
-
-%files vanilla
-/usr/src/linux-%kernelrelease-vanilla
-%endif
-
 %changelog

kernel-source.spec.in

@@ -23,12 +23,7 @@
 
 %include %_sourcedir/kernel-spec-macros
 
-%define src_install_dir usr/src/linux-%kernelrelease%variant
+%(chmod +x %_sourcedir/{@SCRIPTS@})
-
-# if undefined use legacy location of before SLE15
-%if %{undefined _rpmmacrodir}
-%define _rpmmacrodir /etc/rpm
-%endif
 
 Name:           kernel-source@VARIANT@
 Version:        @RPMVERSION@
@@ -48,7 +43,20 @@ BuildRequires:  bash-sh
 BuildRequires:  coreutils
 BuildRequires:  fdupes
 BuildRequires:  sed
-Requires(post): coreutils sed
+%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
+BuildArch:      noarch
+%else
+ExclusiveArch:  do_not_build
+%endif
+Prefix:         /usr/src
+
+%define src_install_dir usr/src/linux-%kernelrelease%variant
+
+# if undefined use legacy location of before SLE15
+%if %{undefined _rpmmacrodir}
+%define _rpmmacrodir /etc/rpm
+%endif
+
 Source0:        @TARBALL_URL@linux-%srcversion.tar.xz
 %if "@TARBALL_URL@" != ""
 Source1:        @TARBALL_URL@linux-%srcversion.tar.sign
@@ -122,12 +130,7 @@ Source113:      patches.kabi.tar.bz2
 Source114:      patches.drm.tar.bz2
 Source120:      kabi.tar.bz2
 Source121:      sysctl.tar.bz2
-%if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
+Requires(post): coreutils sed
-BuildArch:      noarch
-%else
-ExclusiveArch:  do_not_build
-%endif
-Prefix:         /usr/src
 # Source is only complete with devel files.
 Requires:       kernel-devel%variant = %version-%source_rel
 Provides:       %name = %version-%source_rel
@@ -150,8 +153,6 @@ Recommends:     kernel-install-tools
 %endif
 %obsolete_rebuilds %name
 
-%(chmod +x %_sourcedir/{@SCRIPTS@})
-
 # Force bzip2 instead of lzma compression to
 # 1) allow install on older dist versions, and
 # 2) decrease build times (bsc#962356 boo#1175882)
@@ -166,8 +167,15 @@ Linux kernel sources with many fixes and improvements.
 
 
 %source_timestamp
+
+%post
+%relink_function
+
+relink linux-%kernelrelease%variant /usr/src/linux%variant
+
+%files -f nondevel.files
+
 %package -n kernel-devel%variant
-%obsolete_rebuilds kernel-devel%variant
 Summary:        Development files needed for building kernel modules
 Group:          Development/Sources
 AutoReqProv:    off
@@ -175,13 +183,24 @@ Provides:       kernel-devel%variant = %version-%source_rel
 Provides:       multiversion(kernel)
 Requires:       kernel-macros
 Requires(post): coreutils
+%obsolete_rebuilds kernel-devel%variant
 
 %description -n kernel-devel%variant
 Kernel-level headers and Makefiles required for development of
 external kernel modules.
 
+
 %source_timestamp
 
+%post -n kernel-devel%variant
+%relink_function
+
+relink linux-%kernelrelease%variant /usr/src/linux%variant
+
+%files -n kernel-devel%variant -f devel.files
+%ghost /usr/src/linux%variant
+%doc /usr/share/doc/packages/*
+
 # Note: The kernel-macros package intentionally does not provide
 # multiversion(kernel) nor is its name decorated with the variant (-rt)
 %package -n kernel-macros
@@ -192,8 +211,17 @@ Provides:       kernel-subpackage-macros
 %description -n kernel-macros
 This package provides the rpm macros and templates for Kernel Module Packages
 
+
 %source_timestamp
 
+%if "%variant" == ""
+%files -n kernel-macros
+%{_rpmmacrodir}/macros.kernel-source
+/usr/lib/rpm/kernel-*-subpackage
+%dir /usr/lib/rpm/kernel
+/usr/lib/rpm/kernel/*
+%endif
+
 %package vanilla
 %obsolete_rebuilds %name-vanilla
 Summary:        Vanilla Linux kernel sources with minor build fixes
@@ -213,6 +241,11 @@ Vanilla Linux kernel sources with minor build fixes.
 
 %source_timestamp
 
+%if %do_vanilla
+%files vanilla
+/usr/src/linux-%kernelrelease-vanilla
+%endif
+
 %prep
 
 echo "Symbol(s): %symbols"
@@ -295,35 +328,4 @@ done
 ts="$(head -n1 %_sourcedir/source-timestamp)"
 find %buildroot/usr/src/linux* ! -type l | xargs touch -d "$ts"
 
-%post
-%relink_function
-
-relink linux-%kernelrelease%variant /usr/src/linux%variant
-
-%post -n kernel-devel%variant
-%relink_function
-
-relink linux-%kernelrelease%variant /usr/src/linux%variant
-
-%files -f nondevel.files
-
-%files -n kernel-devel%variant -f devel.files
-%ghost /usr/src/linux%variant
-%doc /usr/share/doc/packages/*
-
-%if "%variant" == ""
-%files -n kernel-macros
-%{_rpmmacrodir}/macros.kernel-source
-/usr/lib/rpm/kernel-*-subpackage
-%dir /usr/lib/rpm/kernel
-/usr/lib/rpm/kernel/*
-%endif
-
-
-%if %do_vanilla
-
-%files vanilla
-/usr/src/linux-%kernelrelease-vanilla
-%endif
-
 %changelog

kernel-spec-macros

@@ -11,8 +11,10 @@
 %endif
 
 # TW is usrmerged
-%if %{undefined usrmerged} && 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550
 %define usrmerged 1
+%else
+%define usrmerged 0
 %endif
 
 # source_rel is the package release string, without the rebuild counter
@@ -68,7 +70,7 @@
     rm -f "$2" && ln -s "$1" "$2"			\
 }
 
-%if 0%{?usrmerged}
+%if %{usrmerged}
 %define kernel_module_directory /usr/lib/modules
 %else
 %define kernel_module_directory /lib/modules

kernel-syms-rt.spec

@@ -16,19 +16,16 @@
 #
 
 
-%define git_commit 923c0927ebd1514413e0ed08eef3d8f392b3a46f
+%define git_commit 0d817874d18eca2fc379364350f5d8f656a563b1
 %define variant -rt%{nil}
 
 %include %_sourcedir/kernel-spec-macros
 
 Name:           kernel-syms-rt
-Summary:        Kernel Symbol Versions (modversions)
-License:        GPL-2.0-only
-Group:          Development/Sources
 Version:        6.4.0
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.g923c092
+Release:        <RELEASE>.g0d81787
 %else
 Release:        0
 %endif
@@ -36,24 +33,27 @@ Release:        0
 %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
 Release:        %kernel_source_release
 %endif
+Summary:        Kernel Symbol Versions (modversions)
+License:        GPL-2.0-only
+Group:          Development/Sources
 URL:            https://www.kernel.org/
-AutoReqProv:    off
 BuildRequires:  coreutils
-%ifarch aarch64 x86_64
-Requires:       kernel-rt-devel = %version-%source_rel
-%endif
-Requires:       pesign-obs-integration
-Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-%git_commit
-Provides:       multiversion(kernel)
-Source:         README.KSYMS
-Requires:       kernel-devel%variant = %version-%source_rel
 %if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
 ExclusiveArch:  aarch64 x86_64
 %else
 ExclusiveArch:  do_not_build
 %endif
 Prefix:         /usr/src
+AutoReqProv:    off
+Source:         README.KSYMS
+%ifarch aarch64 x86_64
+Requires:       kernel-rt-devel = %version-%source_rel
+%endif
+Requires:       pesign-obs-integration
+Requires:       kernel-devel%variant = %version-%source_rel
+Provides:       %name = %version-%source_rel
+Provides:       %name-srchash-%git_commit
+Provides:       multiversion(kernel)
 
 # Force bzip2 instead of lzma compression to
 # 1) allow install on older dist versions, and
@@ -70,13 +70,14 @@ package dependencies.
 
 
 %source_timestamp
-%prep
-
-%install
-install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 
 %files
 %dir %_docdir/%name
 %_docdir/%name/README.SUSE
 
+%prep
+
+%install
+install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
+
 %changelog

kernel-syms.spec.in

@@ -22,9 +22,6 @@
 %include %_sourcedir/kernel-spec-macros
 
 Name:           kernel-syms@VARIANT@
-Summary:        Kernel Symbol Versions (modversions)
-License:        GPL-2.0-only
-Group:          Development/Sources
 Version:        @RPMVERSION@
 %if %using_buildservice
 %if 0%{?is_kotd}
@@ -36,22 +33,25 @@ Release:        @RELEASE@
 %define kernel_source_release %(LC_ALL=C rpm -q kernel-devel%variant-%version --qf "%{RELEASE}" | grep -v 'not installed' || echo 0)
 Release:        %kernel_source_release
 %endif
+Summary:        Kernel Symbol Versions (modversions)
+License:        GPL-2.0-only
+Group:          Development/Sources
 URL:            https://www.kernel.org/
-AutoReqProv:    off
 BuildRequires:  coreutils
-@REQUIRES@
-Requires:       pesign-obs-integration
-Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-%git_commit
-Provides:       multiversion(kernel)
-Source:         README.KSYMS
-Requires:       kernel-devel%variant = %version-%source_rel
 %if ! 0%{?is_kotd} || ! %{?is_kotd_qa}%{!?is_kotd_qa:0}
 ExclusiveArch:  @ARCHS@
 %else
 ExclusiveArch:  do_not_build
 %endif
 Prefix:         /usr/src
+AutoReqProv:    off
+Source:         README.KSYMS
+@REQUIRES@
+Requires:       pesign-obs-integration
+Requires:       kernel-devel%variant = %version-%source_rel
+Provides:       %name = %version-%source_rel
+Provides:       %name-srchash-%git_commit
+Provides:       multiversion(kernel)
 
 # Force bzip2 instead of lzma compression to
 # 1) allow install on older dist versions, and
@@ -68,13 +68,14 @@ package dependencies.
 
 
 %source_timestamp
-%prep
-
-%install
-install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
 
 %files
 %dir %_docdir/%name
 %_docdir/%name/README.SUSE
 
+%prep
+
+%install
+install -m 644 -D %{SOURCE0} %buildroot/%_docdir/%name/README.SUSE
+
 %changelog

macros.kernel-source

@@ -6,6 +6,7 @@ else \
     print(  "" ) \
 end
 }
+%usrmerged %{lua: susever = rpm.expand('%{?suse_version}'); if susever ~= '' and tonumber(susever) > 1550 then print('1') else print('0') end }
 %kernel_module_package_release 1
 %kernel_module_package_buildreqs modutils kernel-syms kmod-compat suse-kernel-rpm-scriptlets %kernel_build_shell_package
 

mkspec-dtb

@@ -107,8 +107,6 @@ sub generate_spec($$$)
         unless ($exclusive_arch eq 'none');
 
     my $subpkg_desc = "";
-    my $subpkg_post = "";
-    my $subpkg_files = "";
     my $all_supported_dtb = "";
     my $DTS_folder = "arch/arm/boot/dts";
     if ($exclusive_arch =~ /aarch64/) {
@@ -153,7 +151,7 @@ sub generate_spec($$$)
             "%description -n $PKG_NAME\n" .
             "Device Tree files for $MACHINES.\n\n";
 
-        $subpkg_post .=
+        $subpkg_desc .=
             "%post -n $PKG_NAME\n" .
             "cd /boot\n" .
             "# If /boot/dtb is a symlink, remove it, so that we can replace it.\n" .
@@ -173,7 +171,7 @@ sub generate_spec($$$)
             $dtb_subdir .= "%dir %{dtbdir}$path\n";
         }
 
-        $subpkg_files .=
+        $subpkg_desc .=
             "%ifarch aarch64 riscv64\n" .
             "%files -n $PKG_NAME -f $PKG_NAME.list\n" .
             "%else\n" .
@@ -197,8 +195,6 @@ sub generate_spec($$$)
         $_ =~ s/\$DTS_folder/$DTS_folder/g;
         $_ =~ s/\$SUBPKG_DESC/$subpkg_desc/g;
         $_ =~ s/\$ALL_SUPPORTED_DTB/$all_supported_dtb/g;
-        $_ =~ s/\$SUBPKG_POST\n?/$subpkg_post/g;
-        $_ =~ s/\$SUBPKG_FILES\n?/$subpkg_files/g;
         print SPEC $_;
     }
 

source-timestamp

@@ -1,3 +1,3 @@
-2024-02-22 15:33:25 +0000
+2024-03-11 17:43:09 +0000
-GIT Revision: 923c0927ebd1514413e0ed08eef3d8f392b3a46f
+GIT Revision: 0d817874d18eca2fc379364350f5d8f656a563b1
 GIT Branch: ALP-current-RT

supported.conf

@@ -627,6 +627,15 @@
 -		drivers/crypto/hisilicon/trng/histb-trng	# SP6-NEED-REVIEW
 -		drivers/crypto/hisilicon/zip/hisi_zip		# SP6-NEED-REVIEW
 		drivers/crypto/inside-secure/crypto_safexcel
++external	drivers/crypto/intel/iaa/iaa_crypto				#Intel
++external	drivers/crypto/intel/qat/qat_4xxx/qat_4xxx			#Intel
++external	drivers/crypto/intel/qat/qat_c3xxx/qat_c3xxx			#Intel
++external	drivers/crypto/intel/qat/qat_c3xxxvf/qat_c3xxxvf		#Intel
++external	drivers/crypto/intel/qat/qat_c62x/qat_c62x			#Intel
++external	drivers/crypto/intel/qat/qat_c62xvf/qat_c62xvf			#Intel
++external	drivers/crypto/intel/qat/qat_common/intel_qat			#Intel
++external	drivers/crypto/intel/qat/qat_dh895xcc/qat_dh895xcc		#Intel
++external	drivers/crypto/intel/qat/qat_dh895xccvf/qat_dh895xccvf		#Intel
 		drivers/crypto/keembay/keembay-ocs-aes
 		drivers/crypto/keembay/keembay-ocs-ecc		# SP6-NEED-REVIEW
 		drivers/crypto/keembay/keembay-ocs-hcu
@@ -644,14 +653,6 @@
 -		drivers/crypto/omap-sham					# armv7hl
 		drivers/crypto/padlock-aes
 		drivers/crypto/padlock-sha
-+external	drivers/crypto/qat/qat_4xxx/qat_4xxx				#Intel
-+external	drivers/crypto/qat/qat_c3xxx/qat_c3xxx				#Intel
-+external	drivers/crypto/qat/qat_c3xxxvf/qat_c3xxxvf			#Intel
-+external	drivers/crypto/qat/qat_c62x/qat_c62x				#Intel
-+external	drivers/crypto/qat/qat_c62xvf/qat_c62xvf			#Intel
-+external	drivers/crypto/qat/qat_common/intel_qat				#Intel
-+external	drivers/crypto/qat/qat_dh895xcc/qat_dh895xcc			#Intel
-+external	drivers/crypto/qat/qat_dh895xccvf/qat_dh895xccvf		#Intel
 		drivers/crypto/qce/qcrypto
 -		drivers/crypto/qcom-rng
 		drivers/crypto/rockchip/rk_crypto
@@ -758,6 +759,7 @@
 -		drivers/edac/al_mc_edac
 		drivers/edac/amd64_edac						# EDAC driver for all AMD platforms
 		drivers/ras/amd/atl/amd_atl			# Library used by amd's edac
+		drivers/ras/amd/fmpm
 -!optional	drivers/edac/aspeed_edac					# armv7hl
 		drivers/edac/bluefield_edac
 		drivers/edac/cpc925_edac					# IBM HT-bridge in some PPC hw
@@ -1005,6 +1007,7 @@
 		drivers/gpu/drm/drm_dp_aux_bus
 		drivers/gpu/drm/drm_dp_helper
 		drivers/gpu/drm/drm_exec
+		drivers/gpu/drm/drm_gpuvm
 		drivers/gpu/drm/drm_kms_helper
 -		drivers/gpu/drm/drm_mipi_dbi
 		drivers/gpu/drm/drm_panel_orientation_quirks
@@ -3249,8 +3252,8 @@
 		drivers/net/pcs/pcs-lynx
 -		drivers/net/pcs/pcs-mtk-lynxi		# SP6-NEED-REVIEW
 		drivers/net/pcs/pcs-xpcs
--!optional	drivers/net/phy/adin			# SP6-NEED-REVIEW
+		drivers/net/phy/adin
--!optional	drivers/net/phy/adin1100		# SP6-NEED-REVIEW
+-!optional	drivers/net/phy/adin1100
 		drivers/net/phy/amd
 		drivers/net/phy/aquantia
 		drivers/net/phy/at803x
@@ -5159,6 +5162,7 @@
 +base		drivers/video/fbdev/core/cfbfillrect
 +base		drivers/video/fbdev/core/cfbimgblt
 		drivers/video/fbdev/core/fb
+		drivers/video/fbdev/core/fb_io_fops
 		drivers/video/fbdev/core/fb_sys_fops
 		drivers/video/fbdev/core/syscopyarea
 		drivers/video/fbdev/core/sysfillrect