From c3a38220c3fcd4fd5a6d59e1fb7c948150cf8044 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 20 Jan 2021 15:18:16 -0600 Subject: kernel-5.11.0-0.rc4.20210120git45dfb8a5659a.131 * Wed Jan 20 2021 Fedora Kernel Team [5.11.0-0.rc4.20210120git45dfb8a5659a.131] - redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) - redhat: add genlog.py script (Herton R. Krzesinski) - irq: export irq_check_status_bit (Levi Yun) - Turn off vdso_install for ppc (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- 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 | 23 ++++++++++++++--------- sources | 6 +++--- 9 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e6c1574d2..757c08df1 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 = 131 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index ae97c327f..dffa47ce6 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/6041aa1ca31a9c8b878b142602e2a2bbcdedb902 + 6041aa1ca31a9c8b878b142602e2a2bbcdedb902 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 c2cb6e415..bd1dccf57 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 f60ae530e..42209edfd 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 b68b8500b..d16a9018a 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 393dc3e1f..e150bd819 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 1dd18fd38..104ef06a1 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 3103c2543..1481e3394 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.20210120git45dfb8a5659a.131 %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.20210120git45dfb8a5659a.131 # 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.20210120git45dfb8a5659a.131%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -201,7 +201,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.11 @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11-rc4.tar.xz +Source0: linux-20210120git45dfb8a5659a.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11-rc4 -c -mv linux-5.11-rc4 linux-%{KVERREL} +%setup -q -n kernel-20210120git45dfb8a5659a -c +mv linux-20210120git45dfb8a5659a linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,9 +2735,14 @@ fi # # %changelog -* Mon Jan 18 2021 Fedora Kernel Team [5.11.0-0.rc4.129] +* Wed Jan 20 2021 Fedora Kernel Team [5.11.0-0.rc4.20210120git45dfb8a5659a.131] +- redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) +- redhat: add genlog.py script (Herton R. Krzesinski) - irq: export irq_check_status_bit (Levi Yun) -- Turn off vdso_install for ppc ("Justin M. Forbes") +- 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) (=?UTF-8?q?Dan=20Hor=C3=A1k?=) * 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 98492a0d3..616cc7623 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11-rc4.tar.xz) = 5168c685754a2942d5b67a118e42c352ec8f2ce9a258d76bc3ceed5bab2460f2185c8c11017d76ac5931a62bd8a2cdc646fe4e0620934cb8ae77caa174c49337 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.129.tar.bz2) = 176d2643f0ee0816dac34a6b987cd0a123ca3aea29ff232c692f976cb87434fd1d313bfd560497f20b654e39f2f322db7aab19415a5024dd70f7407fcffc75fc -SHA512 (kernel-kabi-dw-5.11.0-0.rc4.129.tar.bz2) = a27aa9f58fd9553ed4ff00fd2ea92651f9157c5cf72f9606f2f5f090bd8f3a6635885285d5b28c7dce8ed89d088177332e3b8d3b3bcdae9e5b1c73126aca75a9 +SHA512 (linux-20210120git45dfb8a5659a.tar.xz) = 57b42f5182c814dc952fc3e76cff3eb22b09b3f55dfb48cba3238933bc9896d9988366ef874e204378857c57140ec2f35b32a97f5a81639ac81d449acc9e2c6a +SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.20210120git45dfb8a5659a.131.tar.bz2) = e76a9831d9645cd96578d46187b5caedc9ced3dd96b397b3e82ea93a174c3f2526d96d540324572852376c94d7b47320b4cda1fd3c2a52f3796d5bd28d071336 +SHA512 (kernel-kabi-dw-5.11.0-0.rc4.20210120git45dfb8a5659a.131.tar.bz2) = ad4217cd838bf9271395a6fc7466ae242442dd17da063937e1ea5e9532fae0d1b64e3e07b9d02f551338a41ff24fcb990c8b822147697919ec1954dead1070a4 -- cgit