summaryrefslogtreecommitdiffstats
path: root/patch-5.13.0-redhat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-5.13.0-redhat.patch')
-rw-r--r--patch-5.13.0-redhat.patch21
1 files changed, 2 insertions, 19 deletions
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch
index 83e939899..04bc87e49 100644
--- a/patch-5.13.0-redhat.patch
+++ b/patch-5.13.0-redhat.patch
@@ -35,7 +35,6 @@
drivers/nvme/host/multipath.c | 19 +-
drivers/nvme/host/nvme.h | 4 +
drivers/pci/controller/pcie-rockchip-host.c | 12 +-
- drivers/pci/of.c | 5 -
drivers/pci/pci-driver.c | 29 ++
drivers/pci/quirks.c | 24 +
drivers/scsi/aacraid/linit.c | 2 +
@@ -93,7 +92,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 --
- 95 files changed, 1222 insertions(+), 2274 deletions(-)
+ 94 files changed, 1222 insertions(+), 2269 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -171,7 +170,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 3e8dbe68eac8..cd1ac021e6b2 100644
+index 0565caea0362..ec0ddeac9a7f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1517,22 +1516,6 @@ index f1d08a1b1591..78d04ac29cd5 100644
err = pci_host_probe(bridge);
if (err < 0)
goto err_remove_irq_domain;
-diff --git a/drivers/pci/of.c b/drivers/pci/of.c
-index a143b02b2dcd..ba18b43cc7f5 100644
---- a/drivers/pci/of.c
-+++ b/drivers/pci/of.c
-@@ -573,11 +573,6 @@ static int pci_parse_request_of_pci_ranges(struct device *dev,
- break;
- case IORESOURCE_MEM:
- res_valid |= !(res->flags & IORESOURCE_PREFETCH);
--
-- if (!(res->flags & IORESOURCE_PREFETCH))
-- if (upper_32_bits(resource_size(res)))
-- dev_warn(dev, "Memory resource size exceeds max for 32 bits\n");
--
- break;
- }
- }
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index ec44a79e951a..5025827ef396 100644
--- a/drivers/pci/pci-driver.c