From cfd6823b83593e7d9439e72ddd5fe043f4d37fe4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 28 Oct 2021 12:58:42 -0500 Subject: kernel-5.15-0.rc7.20211028git1fc596a56b33.56 * Thu Oct 28 2021 Fedora Kernel Team [5.15-0.rc7.20211028git1fc596a56b33.56] - redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek) - redhat/configs: create a separate config for gcov options (Jan Stancek) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 18 +++++++++++------- sources | 6 +++--- 12 files changed, 24 insertions(+), 20 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index d7191068b..37e2f5a15 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 = 55 +RHEL_RELEASE = 56 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 4f8e9b148..d2bc71a48 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -452,7 +452,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMA_POSSIBLE=y # CONFIG_BCM_FLEXRM_MBOX is not set -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_NS_THERMAL is not set # CONFIG_BCM_PDC_MBOX is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 7c11a9279..fcdeaefa0 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -452,7 +452,7 @@ CONFIG_BCMA_HOST_PCI=y CONFIG_BCMA=m CONFIG_BCMA_POSSIBLE=y # CONFIG_BCM_FLEXRM_MBOX is not set -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_NS_THERMAL is not set # CONFIG_BCM_PDC_MBOX is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a9012e96b..e7be7dd01 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_SBA_RAID is not set # CONFIG_BCM_VK is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index e471b18cb..719a13f8f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_SBA_RAID is not set # CONFIG_BCM_VK is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 7ee532774..8d22f7e51 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA is not set -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_SBA_RAID is not set # CONFIG_BCM_VK is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index c21b88188..6dfb994f5 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -339,7 +339,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA is not set -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_SBA_RAID is not set # CONFIG_BCM_VK is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index f1001c7cc..4ae4981f6 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -343,7 +343,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set # CONFIG_BCMA is not set -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_SBA_RAID is not set # CONFIG_BCM_VK is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index a3262f1f9..9d8b05660 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -367,7 +367,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_SBA_RAID is not set # CONFIG_BCM_VK is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index a6db7c070..2111e1d8b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -367,7 +367,7 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_HOST_SOC is not set CONFIG_BCMA=m -# CONFIG_BCMGENET is not set +CONFIG_BCMGENET=m # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_BCM_SBA_RAID is not set # CONFIG_BCM_VK is not set diff --git a/kernel.spec b/kernel.spec index a8588e377..a88bcdcff 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc7.20211027gitd25f27432f80.55 +%global distro_build 0.rc7.20211028git1fc596a56b33.56 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc7.20211027gitd25f27432f80.55 +%define pkgrelease 0.rc7.20211028git1fc596a56b33.56 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20211027gitd25f27432f80.55%{?buildid}%{?dist} +%define specrelease 0.rc7.20211028git1fc596a56b33.56%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -682,7 +682,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc7-18-gd25f27432f80.tar.xz +Source0: linux-5.15-rc7-33-g1fc596a56b33.tar.xz Source1: Makefile.rhelver @@ -1374,8 +1374,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc7-18-gd25f27432f80 -c -mv linux-5.15-rc7-18-gd25f27432f80 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc7-33-g1fc596a56b33 -c +mv linux-5.15-rc7-33-g1fc596a56b33 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2972,10 +2972,14 @@ fi # # %changelog -* Wed Oct 27 2021 Fedora Kernel Team [5.15-0.rc7.20211027gitd25f27432f80.55] +* Thu Oct 28 2021 Fedora Kernel Team [5.15-0.rc7.20211028git1fc596a56b33.56] - redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek) - redhat/configs: create a separate config for gcov options (Jan Stancek) +* Thu Oct 28 2021 Fedora Kernel Team [5.15-0.rc7.20211028git1fc596a56b33.55] +- Build CONFIG_SPI_PXA2XX as a module on x86 (Justin M. Forbes) +- redhat/configs: enable CONFIG_BCMGENET as module (Joel Savitz) + * Wed Oct 27 2021 Fedora Kernel Team [5.15-0.rc7.20211027gitd25f27432f80.54] - Fedora config updates (Justin M. Forbes) diff --git a/sources b/sources index d2cfd52d2..7405c15da 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-rc7-18-gd25f27432f80.tar.xz) = 71ad5986f1a88f7ab3c269a02757b3bc6603ddf4d2c2215449bb4b431011ab378240d10032731734ade2df07578f521bd82dfeb527be2be4edc769597bdaa23b -SHA512 (kernel-abi-stablelists-5.15.0-0.rc7.20211027gitd25f27432f80.55.tar.bz2) = 2f9cd3571d8537fadb57065b5dab268c0e42555c3b3647a68224364f8ec76c2d3dea69656a36d6cc57e1cc60f0a336529e702b0dfea7b24114872d48af8af8ba -SHA512 (kernel-kabi-dw-5.15.0-0.rc7.20211027gitd25f27432f80.55.tar.bz2) = c68855132b072ab6d738e3b53255c2745650f80c07f80c0e5101b0d8965db3789865eb038c91434894c25d595e4e38a56d8f6b57708600e0a043d7619ea9ad7d +SHA512 (linux-5.15-rc7-33-g1fc596a56b33.tar.xz) = 3d01247f38b2b00be77fcf5fb30598f3090c3155b6aafff4998ceaea0da6e6d121cbfba3bc40d5b1a2afeaea83df636cd9e0c0257c26adc498a5cff0ca9d6952 +SHA512 (kernel-abi-stablelists-5.15.0-0.rc7.20211028git1fc596a56b33.56.tar.bz2) = 752bb4ef2a0ba5019897c2a423d58cd6a7d2ff391af65282b3e2df546c552fb53d666212beaa362b379ed7f9ae9573ec2744a76ed440118e7017fafb73d7cb1f +SHA512 (kernel-kabi-dw-5.15.0-0.rc7.20211028git1fc596a56b33.56.tar.bz2) = c8161ddff89f740519feec746e31ef82144a650dbc2dbfd4487b370d95b28034f535ca172378e4793aea76a12dba333ce6b22e36496095192e8940aa172e78eb -- cgit