kernel-6.3.0-0.rc6.20230414git44149752e998.53

* Fri Apr 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc6.44149752e998.53]
- redhat/configs: Enable CONFIG_X86_KERNEL_IBT for Fedora and ARK (Josh Poimboeuf)
- kernel.spec: gcov: make gcov subpackages per variant (Jan Stancek)
- Linux v6.3.0-0.rc6.44149752e998
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

Makefile.rhelver

@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 52
+RHEL_RELEASE = 53
 
 #
 # RHEL_REBASE_NUM

kernel-x86_64-debug-fedora.config

@@ -8247,7 +8247,7 @@ CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_KERNEL_IBT is not set
+CONFIG_X86_KERNEL_IBT=y
 # CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_INJECT=m

kernel-x86_64-debug-rhel.config

@@ -7254,7 +7254,7 @@ CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_KERNEL_IBT is not set
+CONFIG_X86_KERNEL_IBT=y
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_INJECT=m
 CONFIG_X86_MCE_INTEL=y

kernel-x86_64-fedora.config

@@ -8217,7 +8217,7 @@ CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_KERNEL_IBT is not set
+CONFIG_X86_KERNEL_IBT=y
 # CONFIG_X86_LEGACY_VM86 is not set
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_INJECT=m

kernel-x86_64-rhel.config

@@ -7230,7 +7230,7 @@ CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_INTEL_TSX_MODE_OFF=y
 # CONFIG_X86_INTEL_TSX_MODE_ON is not set
 CONFIG_X86_IOPL_IOPERM=y
-# CONFIG_X86_KERNEL_IBT is not set
+CONFIG_X86_KERNEL_IBT=y
 CONFIG_X86_MCE_AMD=y
 CONFIG_X86_MCE_INJECT=m
 CONFIG_X86_MCE_INTEL=y

kernel.spec

@@ -145,13 +145,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.3.0
 %define specversion 6.3.0
 %define patchversion 6.3
-%define pkgrelease 0.rc6.20230413gitde4664485abb.52
+%define pkgrelease 0.rc6.20230414git44149752e998.53
 %define kversion 6
-%define tarfile_release 6.3-rc6-46-gde4664485abb
+%define tarfile_release 6.3-rc6-138-g44149752e998
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20230413gitde4664485abb.52%{?buildid}%{?dist}
+%define specrelease 0.rc6.20230414git44149752e998.53%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.3.0
 
@@ -1164,12 +1164,12 @@ Kernel sample programs and selftests.
 # with_selftests
 %endif
 
-%if %{with_gcov}
+%define kernel_gcov_package() \
-%package gcov
+%package %{?1:%{1}-}gcov\
-Summary: gcov graph and source files for coverage data collection.
+Summary: gcov graph and source files for coverage data collection.\
-%description gcov
+%description %{?1:%{1}-}gcov\
-kernel-gcov includes the gcov graph and source files for gcov coverage collection.
+%{?1:%{1}-}gcov includes the gcov graph and source files for gcov coverage collection.\
-%endif
+%{nil}
 
 %package -n %{package_name}-abi-stablelists
 Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists
@@ -1409,6 +1409,9 @@ Provides: installonlypkg(kernel)\
 Provides: kernel-%{?1:%{1}-}uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
 %endif\
+%if %{with_gcov}\
+%{expand:%%kernel_gcov_package %{?1:%{1}}}\
+%endif\
 %{nil}
 
 #
@@ -1775,6 +1778,17 @@ BuildKernel() {
       CopyKernel=cp
     fi
 
+%if %{with_gcov}
+    # Make build directory unique for each variant, so that gcno symlinks
+    # are also unique for each variant.
+    if [ -n "$Variant" ]; then
+        ln -s $(pwd) ../linux-%{KVERREL}-${Variant}
+    fi
+    echo "GCOV - continuing build in: $(pwd)"
+    pushd ../linux-%{KVERREL}${Variant:+-${Variant}}
+    pwd > ../kernel${Variant:+-${Variant}}-gcov.list
+%endif
+
     InitBuildVars $Variant
 
     echo BUILDING A KERNEL FOR ${Variant} %{_target_cpu}...
@@ -2403,6 +2417,9 @@ BuildKernel() {
     fi
 %endif
 
+%if %{with_gcov}
+    popd
+%endif
 }
 
 ###
@@ -3268,13 +3285,6 @@ fi
 %files
 %endif
 
-%if %{with_gcov}
-%ifnarch %nobuildarches noarch
-%files gcov
-%{_builddir}
-%endif
-%endif
-
 # This is %%{image_install_path} on an arch where that includes ELF files,
 # or empty otherwise.
 %define elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
@@ -3349,6 +3359,11 @@ fi
 %if %{?3:1} %{!?3:0}\
 %{expand:%%files %{3}}\
 %endif\
+%if %{with_gcov}\
+%ifnarch %nobuildarches noarch\
+%{expand:%%files -f kernel-%{?3:%{3}-}gcov.list %{?3:%{3}-}gcov}\
+%endif\
+%endif\
 %endif\
 %{nil}
 
@@ -3384,6 +3399,11 @@ fi
 #
 #
 %changelog
+* Fri Apr 14 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc6.44149752e998.53]
+- redhat/configs: Enable CONFIG_X86_KERNEL_IBT for Fedora and ARK (Josh Poimboeuf)
+- kernel.spec: gcov: make gcov subpackages per variant (Jan Stancek)
+- Linux v6.3.0-0.rc6.44149752e998
+
 * Thu Apr 13 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc6.de4664485abb.52]
 - Linux v6.3.0-0.rc6.de4664485abb
 

sources

@@ -1,3 +1,3 @@
-SHA512 (linux-6.3-rc6-46-gde4664485abb.tar.xz) = d2666340bfbc3893a975dc8dfc0104d9d626c5edbd98ba5dfb89aec89c6eae59b86721b4d1fc50024515e5d89e7e5259b4b97505d8db1b11e093be7dd7ab4ec5
+SHA512 (linux-6.3-rc6-138-g44149752e998.tar.xz) = 02738548e6e4fc1a3b5a5702f6b8db26b54043c75ff04d12ca4a0c6668fc69af6c69eba0ce8130e7685f267aa27fd59dabd663ada3386d0bc19b687916c4a120
-SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 03432481c85bdb887e43a4314a4d9ecaec83e39eec530d8986f9106399a9f1951bfb730d97779b38067847c7d5fbb420aa40d1b541be229baa17ba18439f6aab
+SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = ee3b7f770c2e02d517ca82e0d81e64274f3716304427546c88c3086008435438859e8a7d6080a6f8b2f33af8df6e5565af60631d03a24e566ccd0b534401155e
-SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 6fda3a826b8a02e6fa4a627e3053681247f3291a063aa955dc1823cbec05288cf6480bf1c01e3e9bd11ed96f84a3538c5190c7ece195f6a1d5f6b8a8c1d5214e
+SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = d19546366abb5eb04fd91b1eeb7a9ec96380e64bb29c4c0029fdaab4bc2c1a30308b8b0525680cad0c833b120b7da100cb54688246d8f3c9f75d8a1a11b2acfb