diff options
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rw-r--r-- | kernel-armv7hl-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-fedora.config | 2 | ||||
-rw-r--r-- | kernel-ppc64le-debug-fedora.config | 1 | ||||
-rw-r--r-- | kernel-ppc64le-fedora.config | 1 | ||||
-rw-r--r-- | kernel-s390x-debug-fedora.config | 1 | ||||
-rw-r--r-- | kernel-s390x-fedora.config | 1 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 1 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 1 | ||||
-rwxr-xr-x | kernel.spec | 18 | ||||
-rw-r--r-- | patch-5.19-redhat.patch | 6 | ||||
-rw-r--r-- | sources | 6 |
14 files changed, 31 insertions, 15 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 73887609a..be7395dfc 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 = 56 +RHEL_RELEASE = 59 # # ZSTREAM diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 026ff2be6..26522ad8c 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -4198,7 +4198,7 @@ CONFIG_MMC_SDHCI_TEGRA=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_SPI=m -# CONFIG_MMC_STM32_SDMMC is not set +CONFIG_MMC_STM32_SDMMC=y CONFIG_MMC_SUNXI=m # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index c9b391b7c..aebfb2db4 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -4180,7 +4180,7 @@ CONFIG_MMC_SDHCI_TEGRA=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_SPI=m -# CONFIG_MMC_STM32_SDMMC is not set +CONFIG_MMC_STM32_SDMMC=y CONFIG_MMC_SUNXI=m # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index d5d844ed9..f0fa74d5a 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -4113,7 +4113,7 @@ CONFIG_MMC_SDHCI_TEGRA=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_SPI=m -# CONFIG_MMC_STM32_SDMMC is not set +CONFIG_MMC_STM32_SDMMC=y CONFIG_MMC_SUNXI=m # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index fd031106b..8405a8004 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -4095,7 +4095,7 @@ CONFIG_MMC_SDHCI_TEGRA=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_SPI=m -# CONFIG_MMC_STM32_SDMMC is not set +CONFIG_MMC_STM32_SDMMC=y CONFIG_MMC_SUNXI=m # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 5ac5d04cb..23b09150d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3498,6 +3498,7 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set +# CONFIG_MMC_STM32_SDMMC is not set # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m # CONFIG_MMC_TOSHIBA_PCI is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index d8a193456..5cdb2e6b7 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3478,6 +3478,7 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set +# CONFIG_MMC_STM32_SDMMC is not set # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m # CONFIG_MMC_TOSHIBA_PCI is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a3da65810..453b78254 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3481,6 +3481,7 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set +# CONFIG_MMC_STM32_SDMMC is not set # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m # CONFIG_MMC_TOSHIBA_PCI is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 7d3b78a50..29faee2ff 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3461,6 +3461,7 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set +# CONFIG_MMC_STM32_SDMMC is not set # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m # CONFIG_MMC_TOSHIBA_PCI is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6d161af76..5e75c9940 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3795,6 +3795,7 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set +# CONFIG_MMC_STM32_SDMMC is not set # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m CONFIG_MMC_TOSHIBA_PCI=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 517763fc9..6f5c3a348 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3776,6 +3776,7 @@ CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_SDHCI_XENON=m CONFIG_MMC_SDRICOH_CS=m # CONFIG_MMC_SPI is not set +# CONFIG_MMC_STM32_SDMMC is not set # CONFIG_MMC_TEST is not set CONFIG_MMC_TIFM_SD=m CONFIG_MMC_TOSHIBA_PCI=m diff --git a/kernel.spec b/kernel.spec index 242534366..9ab881439 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 0 +%define debugbuildsenabled 1 # define buildid .local %define specversion 5.19.0 %define patchversion 5.19 -%define pkgrelease 0.rc7.20220722git68e77ffbfd06.56 +%define pkgrelease 0.rc8.59 %define kversion 5 -%define tarfile_release 5.19-rc7-135-g68e77ffbfd06 +%define tarfile_release 5.19-rc8 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20220722git68e77ffbfd06.56%{?buildid}%{?dist} +%define specrelease 0.rc8.59%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.19.0 @@ -3139,6 +3139,16 @@ fi # # %changelog +* Mon Jul 25 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc8.58] +- fedora: armv7: enable MMC_STM32_SDMMC (Peter Robinson) + +* Sat Jul 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.70664fc10c0d.56] +- .gitlab-ci.yaml: Add test for dist-get-buildreqs target (Prarit Bhargava) +- redhat/docs: Add information on build dependencies (Prarit Bhargava) +- redhat/Makefile: Add better pass message for dist-get-buildreqs (Prarit Bhargava) +- redhat/Makefile: Provide a better message for system-sb-certs (Prarit Bhargava) +- redhat/Makefile: Change dist-buildreq-check to a non-blocking target (Prarit Bhargava) + * Fri Jul 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc7.68e77ffbfd06.55] - create-data: Parallelize spec file data (Prarit Bhargava) - create-data.sh: Store SOURCES Makefile variable (Prarit Bhargava) diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index db6a113ac..9c6147cd1 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -89,10 +89,10 @@ 88 files changed, 2766 insertions(+), 324 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index f2d26cb7e853..c8c658e66f69 100644 +index c0fdb04a0435..f5de4eb69748 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6297,6 +6297,15 @@ +@@ -6315,6 +6315,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -298,7 +298,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 00fd80c5dd6e..7ab3609b69aa 100644 +index b79c1c18149d..d6aa78ebf187 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-5.19-rc7-135-g68e77ffbfd06.tar.xz) = 46c8744a308320b186968eb3cdd2de5d1d1c0c351e9ad8296cd44d53aed639c1621bb8ee8b8d9101fab0744c7e84036db5f5bcea212bfce231f155c6a970b87f -SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 86f6b44fb0da11e9b9975eb84c2a2b9cac14b4e9f7c23cbfdb73d76be838335e0a86edcb02cc99a3a877816d7ff6261c91b00dd4a4820855bc77272b7d20f569 -SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 6a4892751789fc646cc2812f014c7f312abace64e4549df21bc86c65f09f27a64cebec47cf689b9277f580df9544c5e98d54d099500555b92a7945eb635dea02 +SHA512 (linux-5.19-rc8.tar.xz) = 8e79170ad13338fbbf3642f0e82dc797042d3feb2b27df9e0efad1dbf4d816d856d2d38523e7fa32d1e2e8c7209bd9516ea9efffb0685cb8cd8a6f838050f14f +SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 2ef129151b1cbc3f1a525d2a06f6902560f1967c98c59f22d3a9bdb7b2ed1ac5eeb8a194ddca1351be001ed0b379bb9b24a5b860bebcf6f06f2a65be5ab09fd4 +SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 138752bb102fc03172b5020c17677cdc27fef90ba7d18681f32b363f83dc3d1bcabbfebe87ad1a05f26f585a3e511f5cd59a236c4d8711a1e85ce58f2b6e7002 |