summaryrefslogtreecommitdiffstats
path: root/patch-5.13-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.13-redhat.patch')
-rw-r--r--patch-5.13-redhat.patch46
1 files changed, 4 insertions, 42 deletions
diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch
index 490090e..ba1f8f9 100644
--- 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