From 4f63d15975a03c1f1be452c16d298d1f2518233a Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Tue, 19 Jan 2021 11:39:19 -0500 Subject: [PATCH] kernel-5.11.0-0.rc4.130.el9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Tue Jan 19 2021 Herton R. Krzesinski [5.11.0-0.rc4.130] - v5.11-rc4-8-g1e2a199f6ccd rebase - all: s390x: Increase CONFIG_PCI_NR_FUNCTIONS to 512 (#1888735) (Dan Horák) Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel.spec | 21 +++++++++++++-------- sources | 6 +++--- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e6c1574..529fd9e 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 = 129 +RHEL_RELEASE = 130 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index ae97c32..13f6d76 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/4e5047bf34d5d92141b81938a4fea7364e65ab01 - 4e5047bf34d5d92141b81938a4fea7364e65ab01 irq: export irq_check_status_bit +https://gitlab.com/cki-project/kernel-ark/-/commit/3735d3de5dd3cafb1e27e4c03fd30739fe07241e + 3735d3de5dd3cafb1e27e4c03fd30739fe07241e irq: export irq_check_status_bit https://gitlab.com/cki-project/kernel-ark/-/commit/e187313e5f0086538fefe0925ef84480f99616d8 e187313e5f0086538fefe0925ef84480f99616d8 gcc-plugins: fix gcc 11 indigestion with plugins... diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c2cb6e4..bd1dccf 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4177,7 +4177,7 @@ CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y -CONFIG_PCI_NR_FUNCTIONS=64 +CONFIG_PCI_NR_FUNCTIONS=512 CONFIG_PCI_P2PDMA=y CONFIG_PCI_PASID=y # CONFIG_PCIPCWATCHDOG is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index f60ae53..42209ed 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3790,7 +3790,7 @@ CONFIG_PCIE_EDR=y # CONFIG_PCI_J721E_HOST is not set # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI=y -CONFIG_PCI_NR_FUNCTIONS=64 +CONFIG_PCI_NR_FUNCTIONS=512 # CONFIG_PCI_P2PDMA is not set # CONFIG_PCI_PASID is not set # CONFIG_PCIPCWATCHDOG is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index b68b850..d16a901 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4156,7 +4156,7 @@ CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI=y -CONFIG_PCI_NR_FUNCTIONS=64 +CONFIG_PCI_NR_FUNCTIONS=512 CONFIG_PCI_P2PDMA=y CONFIG_PCI_PASID=y # CONFIG_PCIPCWATCHDOG is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 393dc3e..e150bd8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3773,7 +3773,7 @@ CONFIG_PCIE_EDR=y # CONFIG_PCI_J721E_HOST is not set # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI=y -CONFIG_PCI_NR_FUNCTIONS=64 +CONFIG_PCI_NR_FUNCTIONS=512 # CONFIG_PCI_P2PDMA is not set # CONFIG_PCI_PASID is not set # CONFIG_PCIPCWATCHDOG is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 1dd18fd..104ef06 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3797,7 +3797,7 @@ CONFIG_PCIE_EDR=y # CONFIG_PCI_J721E_HOST is not set # CONFIG_PCI_MESON is not set CONFIG_PCI_MSI=y -CONFIG_PCI_NR_FUNCTIONS=64 +CONFIG_PCI_NR_FUNCTIONS=512 # CONFIG_PCI_P2PDMA is not set # CONFIG_PCI_PASID is not set # CONFIG_PCIPCWATCHDOG is not set diff --git a/kernel.spec b/kernel.spec index 655f990..b17305c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc4.129 +%global distro_build 0.rc4.130 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc4.129 +%define pkgrelease 0.rc4.130 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.129%{?buildid}%{?dist} +%define specrelease 0.rc4.130%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.0-0.rc4.129.tar.xz +Source0: linux-5.11.0-0.rc4.130.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc4.129 -c -mv linux-5.11.0-0.rc4.129 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc4.130 -c +mv linux-5.11.0-0.rc4.130 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,11 +2735,16 @@ fi # # %changelog -* Mon Jan 18 2021 Fedora Kernel Team [5.11.0-0.rc4.129] -- v5.11-rc4 rebase +* Tue Jan 19 2021 Herton R. Krzesinski [5.11.0-0.rc4.130] +- v5.11-rc4-8-g1e2a199f6ccd rebase + +* Tue Jan 19 2021 Fedora Kernel Team [5.11.0-0.rc4.20210119git1e2a199f6ccd.130] - irq: export irq_check_status_bit (Levi Yun) - Turn off vdso_install for ppc ("Justin M. Forbes") +* Tue Jan 19 2021 Fedora Kernel Team [5.11.0-0.rc4.20210119git1e2a199f6ccd.129] +- all: s390x: Increase CONFIG_PCI_NR_FUNCTIONS to 512 (#1888735) (Dan Horák) + * Sat Jan 16 2021 Fedora Kernel Team [5.11.0-0.rc3.20210116git1d94330a437a.126] - Fedora 5.11 configs pt 1 ("Justin M. Forbes") diff --git a/sources b/sources index 6a333c2..01e7481 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc4.129.tar.xz) = 9a22e7ceb494517bf26fee879f6ce209e81c57a7a16bbfc6ad81b7289592dbe704bd908b2f2d142f53c19f5d197b5ea342f7844e1bcab1dc2a2c25bf0ca88400 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.129.tar.bz2) = 1c2882d0539123700070736019bc492118cba984d07957414f9c311d07524156d4f263a2c9e6d1bfe85bf19b2fb9563b016d2da1ef195bdba7489a23c4f1a298 -SHA512 (kernel-kabi-dw-5.11.0-0.rc4.129.tar.bz2) = ce919ec977351ca33f5b2f01fa8c698c71df9bef6a6b6ec1c3a9d076d58522c63f6bd092d8af7a52a5261c2ceaac5130522f02a272e622a31beafa756466b269 +SHA512 (linux-5.11.0-0.rc4.130.tar.xz) = 9bf490abfa55067288bcbff7a91816870e1130751f0085a60b29e3f301083f958464a4b36bf867f2c064aee67b4656146d64b220dd7be4d55991566b30be11b9 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.130.tar.bz2) = e4b54310df978666f42dd6cd85a3a97f5024500db4c24bf07956ab4af9095e59c44d97a4a26a46bfdb7c02ac429086226ceca271237521a368629df5a7d943bf +SHA512 (kernel-kabi-dw-5.11.0-0.rc4.130.tar.bz2) = 2aa15c2d1f691930e06e6d25a788ebe87ad3fbbd5e37cf06ea4ffdb71dd07eb04b59fe0763a758571213c4cc0cf7fe9c7b38542f48be5f5d7e1b8e7a7a8a0f13