diff --git a/Makefile.rhelver b/Makefile.rhelver index 757c08d..28534fe 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 = 131 +RHEL_RELEASE = 132 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index dffa47c..971da22 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/6041aa1ca31a9c8b878b142602e2a2bbcdedb902 - 6041aa1ca31a9c8b878b142602e2a2bbcdedb902 irq: export irq_check_status_bit +https://gitlab.com/cki-project/kernel-ark/-/commit/69b08dde2fd74554ec90f5d3a66d4775df65858d + 69b08dde2fd74554ec90f5d3a66d4775df65858d 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-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 39024fd..e07ce50 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7785,7 +7785,8 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1a43cef..ca6d732 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7760,7 +7760,8 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 47438a1..902e701 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2548,7 +2548,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set @@ -8056,7 +8056,8 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 9fc88cc..b30aa2c 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2533,7 +2533,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set @@ -8034,7 +8034,8 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 0a294c2..bf6a3cc 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2494,7 +2494,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set @@ -7802,7 +7802,8 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index a40114a..80e21f6 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2479,7 +2479,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set @@ -7780,7 +7780,8 @@ CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set CONFIG_USB_XHCI_MVEBU=m -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XHCI_TEGRA=m CONFIG_USB_XUSBATM=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 4b7d7b1..18994f6 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -7003,7 +7003,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 551e8a3..7f05032 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -6981,7 +6981,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 397df0a..4974ab4 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -6585,7 +6585,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 7c398de..6402174 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -6562,7 +6562,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index bd1dccf..417d3ec 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6522,7 +6522,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index d16a901..e9d4063 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -6499,7 +6499,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y # CONFIG_USB_XHCI_PLATFORM is not set CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 0e0dfff..9855ff7 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7060,7 +7060,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index efd96d6..e3ecbfc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7036,7 +7036,8 @@ CONFIG_USB_WDM=m CONFIG_USB_XHCI_DBGCAP=y CONFIG_USB_XHCI_HCD=y # CONFIG_USB_XHCI_HISTB is not set -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y +CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=m CONFIG_USB_XUSBATM=m CONFIG_USB=y diff --git a/kernel.spec b/kernel.spec index 6ae815b..6e962d0 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.131 +%global distro_build 0.rc4.132 %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.131 +%define pkgrelease 0.rc4.132 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.131%{?buildid}%{?dist} +%define specrelease 0.rc4.132%{?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.131.tar.xz +Source0: linux-5.11.0-0.rc4.132.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc4.131 -c -mv linux-5.11.0-0.rc4.131 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc4.132 -c +mv linux-5.11.0-0.rc4.132 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,15 +2735,19 @@ fi # # %changelog -* Wed Jan 20 2021 Herton R. Krzesinski [5.11.0-0.rc4.131] -- v5.11-rc4-15-g45dfb8a5659a rebase +* Thu Jan 21 2021 Herton R. Krzesinski [5.11.0-0.rc4.132] +- v5.11-rc4-86-g9791581c049c rebase -* Wed Jan 20 2021 Fedora Kernel Team [5.11.0-0.rc4.20210120git45dfb8a5659a.131] +* Thu Jan 21 2021 Fedora Kernel Team [5.11.0-0.rc4.20210121git9791581c049c.132] - 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) +* Thu Jan 21 2021 Fedora Kernel Team [5.11.0-0.rc4.20210121git9791581c049c.131] +- Fix USB_XHCI_PCI regression ("Justin M. Forbes") +- fedora: fixes for ARMv7 build issue by disabling HIGHPTE (Peter Robinson) + * 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?=) diff --git a/sources b/sources index 4749972..155ca29 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc4.131.tar.xz) = d92302df8b0eeede6cbb12d229b7ba45436b82615e43d39c9db6561a90b97f528ab726a0c880f1c4369e57f74f25f22fc7ddf25551ca6f75bc7cd8fefd9aaacd -SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.131.tar.bz2) = ed1e8e1611fedfd26fe2ff7d9506a0e5c5c18296510bb01f00df4406a6971bc17d5568ef1808fc4d5fb9ead360a39edd077f73854b5ea22e7d44c068874b54d8 -SHA512 (kernel-kabi-dw-5.11.0-0.rc4.131.tar.bz2) = eab931894f70e2d540d3a6b3090c803acdd4beecc8822b53d435f618a5fd140143f140bd1e16f90a3ec3f49ca8c7f8427da6ec2da1b02711f579be7da8ed3090 +SHA512 (linux-5.11.0-0.rc4.132.tar.xz) = 877526b3ddb53ebd0d24d01c70f229d28e2b5225de7ec5dce091bb9d8983891902c92c097ec653d62fea393ed0c0c1feaa5a323065622fbfac446d8936033ea7 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.132.tar.bz2) = e34e27298a1b24abd95c1713dd0e947aa60e42893a6dfdbdc44db2c3ca593e634f527278eec5c19e382b7a5e834de14dcb4d4d427173bdffc0d6fe030c4f017c +SHA512 (kernel-kabi-dw-5.11.0-0.rc4.132.tar.bz2) = fc449a6d8bf1fcd3840521114a3a8b6fe139a582c8881c23410f01e3b859a4e7b4c342d5fe4df124ba81595c0388b5b76e30c833a7f92d31766c663487c67eb1