diff --git a/Makefile.rhelver b/Makefile.rhelver index bae58f2f3..54241a0bb 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 25 +RHEL_RELEASE = 26 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index ea203c7e5..173b3fcad 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3818,6 +3818,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_DDR_PMU is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 960b72e5a..5e00b1ab5 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3799,6 +3799,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_DDR_PMU is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 126429e43..742cba98b 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3836,6 +3836,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index f88e3316f..eac1698e1 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -3819,6 +3819,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 016cbcdd9..c912de011 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -3760,6 +3760,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 5ac98d9cc..d290b1cf4 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -3743,6 +3743,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index f098d8b19..f14f9d276 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3193,6 +3193,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 2d0ba09d2..54a0fb651 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3174,6 +3174,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MAILBOX_TEST is not set # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 8835f4f7a..44ec6f7a6 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3167,7 +3167,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z10 is not set -# CONFIG_MARCH_Z13 is not set +CONFIG_MARCH_Z13=y # CONFIG_MARCH_Z14 is not set # CONFIG_MARCH_Z15 is not set # CONFIG_MARCH_Z16 is not set @@ -3175,7 +3175,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z900 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z990 is not set -CONFIG_MARCH_ZEC12=y +# CONFIG_MARCH_ZEC12 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index bb6703cd7..63979c5fe 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3148,7 +3148,7 @@ CONFIG_MAGIC_SYSRQ=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z10 is not set -# CONFIG_MARCH_Z13 is not set +CONFIG_MARCH_Z13=y # CONFIG_MARCH_Z14 is not set # CONFIG_MARCH_Z15 is not set # CONFIG_MARCH_Z16 is not set @@ -3156,7 +3156,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z900 is not set # CONFIG_MARCH_Z9_109 is not set # CONFIG_MARCH_Z990 is not set -CONFIG_MARCH_ZEC12=y +# CONFIG_MARCH_ZEC12 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index c3ff2ea93..7e10c977d 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3472,6 +3472,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index de2f140ce..b823c25a7 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3453,6 +3453,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set diff --git a/kernel.spec b/kernel.spec index da0ebe7f1..36c1c11e0 100755 --- a/kernel.spec +++ b/kernel.spec @@ -120,17 +120,17 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # define buildid .local %define specversion 6.0.0 %define patchversion 6.0 -%define pkgrelease 0.rc3.25 +%define pkgrelease 0.rc3.20220830gitdcf8e5633e2e.26 %define kversion 6 -%define tarfile_release 6.0-rc3 +%define tarfile_release 6.0-rc3-7-gdcf8e5633e2e # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.25%{?buildid}%{?dist} +%define specrelease 0.rc3.20220830gitdcf8e5633e2e.26%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.0.0 @@ -3147,6 +3147,15 @@ fi # # %changelog +* Tue Aug 30 2022 Fedora Kernel Team [6.0.0-0.rc3.dcf8e5633e2e.26] +- Add cpumask_kunit to mod-internal.list (Justin M. Forbes) +- config - consolidate disabled MARCH options on s390x (Dan Horák) +- move the baseline arch to z13 for s390x in F-37+ (Dan Horák) +- redhat/scripts/rh-dist-git.sh: Fix outdated cvs reference (Prarit Bhargava) +- redhat/scripts/expand_srpm.sh: Use Makefile variables (Prarit Bhargava) +- redhat/scripts/clone_tree.sh: Use Makefile variables (Prarit Bhargava) +- Linux v6.0.0-0.rc3.dcf8e5633e2e + * Mon Aug 29 2022 Fedora Kernel Team [6.0.0-0.rc3.25] - Linux v6.0.0-0.rc3 diff --git a/sources b/sources index eaf8370b9..d1f9c3b93 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.0-rc3.tar.xz) = 8d101e876715bd12ed8fadfabe54f2697df1522d552d3875e5e6fdf2585558e6587d588ed6df50cbd2fff6e645ba67bad1637f97e7860acddb8f81ce45867c2d -SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = cfda657a9f09b490bd839eaf4cde0dadb472da32066ab7f50238298ff13970ff5c0727f15f3791763d0c878d2d3b87c8227e2711077ea7a9cf231c7d906570c6 -SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 9a0eefb853efa02af82b86996e974f87e5f04477558d17b235c618a70307d1ce1e3a93806ecbc04678deb644fc6fac67488bd0a96eb6111a13ee81ff3566d28e +SHA512 (linux-6.0-rc3-7-gdcf8e5633e2e.tar.xz) = 629f0799167507f6e15bac0939bdf0bc22901b46117c577f939c21acbced042c4c4afb4e72278facae592691a693f2305d162bf5e1b0de4fa78d9fd3e082cb87 +SHA512 (kernel-abi-stablelists-6.0.0.tar.bz2) = 40f85bebf15454890f4490ecb2e50db75e8b804ed9a8a5ef8f4cc96faca8262ec8b92710f25da261d0b17b69b53f33f31650ab441ae65cb641d1ce9e2ac36d0f +SHA512 (kernel-kabi-dw-6.0.0.tar.bz2) = 26f08f572531859c560d799af2a6f4c4490e335c3760efa5857ef848afb1a5653c21ea13b67bca95410720a7f7e052e5d8818123d220b125d788bb8651e3c27e