diff options
25 files changed, 43 insertions, 49 deletions
diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index bf425fc..78e2b7c 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -612,6 +612,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config index 15b992a..f0e56e5 100644 --- a/SOURCES/kernel-aarch64-debug-rhel.config +++ b/SOURCES/kernel-aarch64-debug-rhel.config @@ -429,6 +429,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index 4ac75ff..3798fbe 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -612,6 +612,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config index 40d7bd2..84a906a 100644 --- a/SOURCES/kernel-aarch64-rhel.config +++ b/SOURCES/kernel-aarch64-rhel.config @@ -429,6 +429,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config index e95486e..af3a496 100644 --- a/SOURCES/kernel-armv7hl-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-debug-fedora.config @@ -636,6 +636,7 @@ CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_RX51=m CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config index 02502e8..f5a921f 100644 --- a/SOURCES/kernel-armv7hl-fedora.config +++ b/SOURCES/kernel-armv7hl-fedora.config @@ -636,6 +636,7 @@ CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_RX51=m CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config index 560ee70..4a0c09c 100644 --- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config @@ -616,6 +616,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config index cd20baf..4d89d18 100644 --- a/SOURCES/kernel-armv7hl-lpae-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-fedora.config @@ -616,6 +616,7 @@ CONFIG_BATTERY_GOLDFISH=m CONFIG_BATTERY_MAX17040=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set CONFIG_BATTERY_SBS=m CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-i686-debug-fedora.config b/SOURCES/kernel-i686-debug-fedora.config index 1f01db0..3583a9e 100644 --- a/SOURCES/kernel-i686-debug-fedora.config +++ b/SOURCES/kernel-i686-debug-fedora.config @@ -461,6 +461,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=y +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-i686-fedora.config b/SOURCES/kernel-i686-fedora.config index 7b42359..1e2de05 100644 --- a/SOURCES/kernel-i686-fedora.config +++ b/SOURCES/kernel-i686-fedora.config @@ -460,6 +460,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_OLPC=y +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config index 47ff477..ae5815d 100644 --- a/SOURCES/kernel-ppc64le-debug-fedora.config +++ b/SOURCES/kernel-ppc64le-debug-fedora.config @@ -420,6 +420,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config index 7e518b0..5431bdf 100644 --- a/SOURCES/kernel-ppc64le-debug-rhel.config +++ b/SOURCES/kernel-ppc64le-debug-rhel.config @@ -318,6 +318,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index 560ec77..4941d49 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -419,6 +419,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index 27f8f15..eb0364b 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -318,6 +318,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config index cac7a72..13a0176 100644 --- a/SOURCES/kernel-s390x-debug-fedora.config +++ b/SOURCES/kernel-s390x-debug-fedora.config @@ -424,6 +424,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config index 313974a..d2705e2 100644 --- a/SOURCES/kernel-s390x-debug-rhel.config +++ b/SOURCES/kernel-s390x-debug-rhel.config @@ -318,6 +318,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config index 620a981..b59b894 100644 --- a/SOURCES/kernel-s390x-fedora.config +++ b/SOURCES/kernel-s390x-fedora.config @@ -423,6 +423,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config index 47e4ff4..f835630 100644 --- a/SOURCES/kernel-s390x-rhel.config +++ b/SOURCES/kernel-s390x-rhel.config @@ -318,6 +318,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config index 30a9fc8..477465e 100644 --- a/SOURCES/kernel-s390x-zfcpdump-rhel.config +++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config @@ -322,6 +322,7 @@ CONFIG_BASE_SMALL=0 # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index d4346ed..4bbe3e3 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -468,6 +468,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index b167515..91c2dcc 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -346,6 +346,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index 20461c9..a3d1dcb 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -467,6 +467,7 @@ CONFIG_BATTERY_GOLDFISH=m # CONFIG_BATTERY_MAX17040 is not set CONFIG_BATTERY_MAX17042=m # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set CONFIG_BATTERY_SURFACE=m CONFIG_BAYCOM_EPP=m diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index fee0034..75afce4 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -346,6 +346,7 @@ CONFIG_BAREUDP=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BCACHE is not set # CONFIG_BCM54140_PHY is not set diff --git a/SOURCES/patch-5.13-redhat.patch b/SOURCES/patch-5.13-redhat.patch index 490090e..ba1f8f9 100644 --- a/SOURCES/patch-5.13-redhat.patch +++ b/SOURCES/patch-5.13-redhat.patch @@ -28,7 +28,6 @@ drivers/iommu/iommu.c | 22 + drivers/net/wireguard/main.c | 6 + drivers/nvme/host/pci.c | 28 +- - drivers/pci/controller/pcie-rockchip-host.c | 12 +- drivers/pci/quirks.c | 24 + drivers/platform/x86/amd-pmc.c | 248 +++++++++- drivers/scsi/smartpqi/smartpqi_init.c | 16 + @@ -66,7 +65,7 @@ tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- .../selftests/bpf/progs/test_static_linked1.c | 30 -- .../selftests/bpf/progs/test_static_linked2.c | 31 -- - 68 files changed, 915 insertions(+), 2360 deletions(-) + 67 files changed, 909 insertions(+), 2354 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -91,10 +90,10 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index 83f4212e004f..91790cbefd7c 100644 +index 975acb16046d..e6b00e6d0094 100644 --- a/Makefile +++ b/Makefile -@@ -503,6 +503,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE +@@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE KBUILD_CFLAGS := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \ -Werror=implicit-function-declaration -Werror=implicit-int \ @@ -204,7 +203,7 @@ index dba04fbc37a2..f809ab6441fd 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 382d73da134c..f5b2b127e24d 100644 +index 93538e63fa03..60e4b4275dc4 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -1451,43 +1450,6 @@ index 42ad75ff1348..5a72bdf5ad03 100644 /* * Some systems use a bios work around to ask for D3 on * platforms that support kernel managed suspend. -diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c -index f1d08a1b1591..78d04ac29cd5 100644 ---- a/drivers/pci/controller/pcie-rockchip-host.c -+++ b/drivers/pci/controller/pcie-rockchip-host.c -@@ -592,10 +592,6 @@ static int rockchip_pcie_parse_host_dt(struct rockchip_pcie *rockchip) - if (err) - return err; - -- err = rockchip_pcie_setup_irq(rockchip); -- if (err) -- return err; -- - rockchip->vpcie12v = devm_regulator_get_optional(dev, "vpcie12v"); - if (IS_ERR(rockchip->vpcie12v)) { - if (PTR_ERR(rockchip->vpcie12v) != -ENODEV) -@@ -973,8 +969,6 @@ static int rockchip_pcie_probe(struct platform_device *pdev) - if (err) - goto err_vpcie; - -- rockchip_pcie_enable_interrupts(rockchip); -- - err = rockchip_pcie_init_irq_domain(rockchip); - if (err < 0) - goto err_deinit_port; -@@ -992,6 +986,12 @@ static int rockchip_pcie_probe(struct platform_device *pdev) - bridge->sysdata = rockchip; - bridge->ops = &rockchip_pcie_ops; - -+ err = rockchip_pcie_setup_irq(rockchip); -+ if (err) -+ goto err_remove_irq_domain; -+ -+ rockchip_pcie_enable_interrupts(rockchip); -+ - err = pci_host_probe(bridge); - if (err < 0) - goto err_remove_irq_domain; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 6d74386eadc2..2333c1e4ae05 100644 --- a/drivers/pci/quirks.c diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index ca4e783..403b8ac 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -116,7 +116,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.13 -%define rpmversion 5.13.3 +%define rpmversion 5.13.4 %define stableversion 5.13 %define pkgrelease 201 @@ -646,7 +646,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13.3.tar.xz +Source0: linux-5.13.4.tar.xz Source1: Makefile.rhelver @@ -1322,8 +1322,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13.3 -c -mv linux-5.13.3 linux-%{KVERREL} +%setup -q -n kernel-5.13.4 -c +mv linux-5.13.4 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2900,10 +2900,19 @@ fi # # %changelog -* Tue Jul 20 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.13.3-201.fsync -- Linux v5.13.3 futex2 zen openrgb winesync +* Wed Jul 21 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.13.4-201.fsync +- Linux v5.13.4 futex2 zen openrgb -* Mon Jul 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.3-200] +* Tue Jul 20 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.4-200] +- RHEL configs need this too (Justin M. Forbes) +- kernel-5.13.4-0 (Justin M. Forbes) +- Config update for 5.13.4 (Justin M. Forbes) +- kernel-5.13.3-0 (Justin M. Forbes) +- Don't tag a release as [redhat] (Justin M. Forbes) +- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang) + +* Tue Jul 20 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.4-0] +- Config update for 5.13.4 (Justin M. Forbes) - kernel-5.13.3-0 (Justin M. Forbes) - Don't tag a release as [redhat] (Justin M. Forbes) - platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang) |