From 1e0aef3c8fd22ad01d73d3a066e72a26328d3ef2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 21 Aug 2020 10:23:40 -0500 Subject: kernel-5.9.0-0.rc1.20200821gitda2968ff879b.1 * Fri Aug 21 2020 Fedora Kernel Team [5.9.0-0.rc1.20200821gitda2968ff879b.1] - da2968ff879b rebase - Temporarily remove cdomain from sphinx documentation ("Justin M. Forbes") - Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 ("Justin M. Forbes") - Updated changelog for the release based on 18445bf405cb (Fedora Kernel Team) - enable PROTECTED_VIRTUALIZATION_GUEST for all s390x kernels (=?UTF-8?q?Dan=20Hor=C3=A1k?=) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- ...-remove-cdomain-from-sphinx-documentation.patch | 29 ++++++++++++++++++++++ ...-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch | 2 +- Patchlist | 2 ++ kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel.spec | 21 +++++++++++----- sources | 6 ++--- 7 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch diff --git a/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch new file mode 100644 index 000000000..c9605b88c --- /dev/null +++ b/0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" +Date: Mon, 10 Aug 2020 08:06:05 -0500 +Subject: [PATCH] Temporarily remove cdomain from sphinx documentation + +The documentation subpackage will not build currently. +https://github.com/sphinx-doc/sphinx/issues/7421 + +Signed-off-by: Justin M. Forbes +--- + Documentation/conf.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/conf.py b/Documentation/conf.py +index c503188880d9..b5b2be8eec22 100644 +--- a/Documentation/conf.py ++++ b/Documentation/conf.py +@@ -36,7 +36,7 @@ needs_sphinx = '1.3' + # Add any Sphinx extension module names here, as strings. They can be + # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom + # ones. +-extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain', ++extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', + 'kfigure', 'sphinx.ext.ifconfig', 'automarkup', + 'maintainers_include', 'sphinx.ext.autosectionlabel' ] + +-- +2.26.2 + diff --git a/0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch b/0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch index 93b1e9be0..c474fdf47 100644 --- a/0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +++ b/0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch @@ -1,4 +1,4 @@ -From 90750a5b1205a7dcc002224738585b861779cdae Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 30 Jul 2020 10:26:11 -0500 Subject: [PATCH] Work around for gcc bug diff --git a/Patchlist b/Patchlist index f587b8037..27113a419 100644 --- a/Patchlist +++ b/Patchlist @@ -69,3 +69,5 @@ 0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.patch 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch +0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 74eb093c2..291c03204 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4234,7 +4234,7 @@ CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y -# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set +CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y CONFIG_PROVE_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 67b85c8ff..3f39a650b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4214,7 +4214,7 @@ CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y -# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set +CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y # CONFIG_PROVE_LOCKING is not set # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m diff --git a/kernel.spec b/kernel.spec index e24c94099..3541492bd 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc1.20200820git18445bf405cb.1 +%global distro_build 0.rc1.20200821gitda2968ff879b.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -69,13 +69,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 0.rc1.20200820git18445bf405cb.1 +%define pkgrelease 0.rc1.20200821gitda2968ff879b.1 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20200820git18445bf405cb.1%{?buildid}%{?dist} +%define specrelease 0.rc1.20200821gitda2968ff879b.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -567,7 +567,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200820git18445bf405cb.tar.xz +Source0: linux-20200821gitda2968ff879b.tar.xz Source1: Makefile.rhelver @@ -788,6 +788,7 @@ Patch70: 0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.patch Patch71: 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch %endif @@ -1283,8 +1284,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200820git18445bf405cb -c -mv linux-20200820git18445bf405cb linux-%{KVERREL} +%setup -q -n kernel-20200821gitda2968ff879b -c +mv linux-20200821gitda2968ff879b linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1363,6 +1364,7 @@ ApplyOptionalPatch 0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.pat ApplyOptionalPatch 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch %endif @@ -2791,6 +2793,13 @@ fi # # %changelog +* Fri Aug 21 2020 Fedora Kernel Team [5.9.0-0.rc1.20200821gitda2968ff879b.1] +- da2968ff879b rebase +- Temporarily remove cdomain from sphinx documentation ("Justin M. Forbes") +- Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 ("Justin M. Forbes") +- Updated changelog for the release based on 18445bf405cb (Fedora Kernel Team) +- enable PROTECTED_VIRTUALIZATION_GUEST for all s390x kernels (=?UTF-8?q?Dan=20Hor=C3=A1k?=) + * Wed Aug 19 2020 Fedora Kernel Team [5.9.0-0.rc1.20200819git18445bf405cb.1] - 18445bf405cb rebase - Add mlx5_vdpa to module filter for Fedora ("Justin M. Forbes") diff --git a/sources b/sources index 45ce0e2a0..8bd62451b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-20200820git18445bf405cb.tar.xz) = d0d84ccb487f56bcaa276e48d23594db3f13b13a3c0ed289c86d1bf93a3fdb6e9717af8c51846c0d6a3ae69831634f73e19f57715429a68053639906921017d1 -SHA512 (kernel-abi-whitelists-5.9.0-0.rc1.20200820git18445bf405cb.1.tar.bz2) = 14316c290db003edd53c5c2eec34f94fac50c4a920571b77fc0bee9e62eac86f9f25cea310dbdb6f765ce72eb37b4f32c4d6fe49bf5a171240dec31721d4a8c1 -SHA512 (kernel-kabi-dw-5.9.0-0.rc1.20200820git18445bf405cb.1.tar.bz2) = 854ecccec0537f59daa008cbbc18127b6deb66ee1597b5d52d97a5746a96644559b579dc30f1699f76f93452d2566b271dc5ef6c95e6baf7277e427239faf4c6 +SHA512 (linux-20200821gitda2968ff879b.tar.xz) = 347deb4ccf7f3fbafe6aa365864539988cb54fb8adb052c2695eb271713cb426582727d4c79134fed42551a54699c592bd2be592d3cc8e4c3e01de371140d034 +SHA512 (kernel-abi-whitelists-5.9.0-0.rc1.20200821gitda2968ff879b.1.tar.bz2) = b9257351ac39bcc4766853cf1e31eafa283f4e58683db9b8b0d5d44ce218b670ecb14aaff5e050b1a43460f97642a89dd555dcb4b978c72cdf2a290c5fe13547 +SHA512 (kernel-kabi-dw-5.9.0-0.rc1.20200821gitda2968ff879b.1.tar.bz2) = 1f398ce5dac24d244bb50836a026b75d3c362d51e12026a7cfbdc7d365408beb8a38eafaa353f93c2b23481b88e3ba12e745c8b0998bd89c9172ff033262989b -- cgit