kernel-5.13.4-100

* Tue Jul 20 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.4-100] - 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) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2021-07-20 15:05:55 -05:00 · 2021-07-20 15:05:55 -05:00 · a219e71ba3
parent 8fc0fb03ce
commit a219e71ba3
26 changed files with 44 additions and 50 deletions
--- a/kernel-aarch64-debug-fedora.config
+++ b/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
--- a/kernel-aarch64-debug-rhel.config
+++ b/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
--- a/kernel-aarch64-fedora.config
+++ b/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
--- a/kernel-aarch64-rhel.config
+++ b/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
--- a/kernel-armv7hl-debug-fedora.config
+++ b/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
--- a/kernel-armv7hl-fedora.config
+++ b/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
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/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
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/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
--- a/kernel-i686-debug-fedora.config
+++ b/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
--- a/kernel-i686-fedora.config
+++ b/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
--- a/kernel-ppc64le-debug-fedora.config
+++ b/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
--- a/kernel-ppc64le-debug-rhel.config
+++ b/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
--- a/kernel-ppc64le-fedora.config
+++ b/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
--- a/kernel-ppc64le-rhel.config
+++ b/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
--- a/kernel-s390x-debug-fedora.config
+++ b/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
--- a/kernel-s390x-debug-rhel.config
+++ b/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
--- a/kernel-s390x-fedora.config
+++ b/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
--- a/kernel-s390x-rhel.config
+++ b/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
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/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
--- a/kernel-x86_64-debug-fedora.config
+++ b/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
--- a/kernel-x86_64-debug-rhel.config
+++ b/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
--- a/kernel-x86_64-fedora.config
+++ b/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
--- a/kernel-x86_64-rhel.config
+++ b/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
--- a/kernel.spec
+++ b/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 100

@ -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

@ -1316,8 +1316,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} .
@ -2888,7 +2888,16 @@ fi
 #
 #
 %changelog
-* Mon Jul 19 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.3-100]
+* Tue Jul 20 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.4-100]
+- 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)
--- a/patch-5.13-redhat.patch
+++ b/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
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.13.3.tar.xz) = 26e00d0689f26db2f8810cccc3d3975975695c7c9adef0dc67bdec1733b52c3f8b32bbccdaf2f0762c7ac072bf8c5272606fc0ce830df014f445ebb20583e95d
-SHA512 (kernel-abi-whitelists-5.13.3-100.tar.bz2) = b307bfcfea998b0b9591200ebb0037f1257eed002f7c9d510b9d60c8df1bd1690b2801f8de189b9e74eff4ed66d2160aa605fcceea9dbc928fc035c640b1d00d
-SHA512 (kernel-kabi-dw-5.13.3-100.tar.bz2) = 6f710d9b8af61472acf7f1d74ae8afd08ab7bd2fce0ac5ba9d4e3399596aef8bc5288007963902dd3f22191090030b79811dfbc85ecf9aeb5f49da3ce928fd62
+SHA512 (linux-5.13.4.tar.xz) = 702e263302f46ce18d169134faac13dd730bb2d24d9b38f24eae028175e3b966f448faaea21f395a73229ffc0260d6bf4c96d4ed38d99bc898005d41db41aa86
+SHA512 (kernel-abi-whitelists-5.13.4-100.tar.bz2) = f958eb92b7a32a33bbe683048fa1e3b1740fda2a30d5dc6fc585402129212182814df0969183fa58e21f256ea68904f5c3b5f1d1e6246209b8da3927da812d3c
+SHA512 (kernel-kabi-dw-5.13.4-100.tar.bz2) = 45e8649f488ea6cf43df549fce9c50842d3d0e49b51fc01a4d1196bbcc39f2889ebb8b24fe55026de49b0cc20c393d2203c64043a8b1366d5968f8aa8ba4ae4d