drop mips patch from 4.9 and 3.18 trees

diff --git a/queue-3.18/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch b/queue-3.18/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch
deleted file mode 100644 (file)
index 972ae0b..0000000
--- a/queue-3.18/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From foo@baz Thu Oct  5 10:58:04 CEST 2017
-From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-Date: Wed, 23 Nov 2016 14:43:50 +0100
-Subject: MIPS: kexec: Do not reserve invalid crashkernel memory on boot
-
-From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-
-
-[ Upstream commit a8f108d70c74d83574c157648383eb2e4285a190 ]
-
-Do not reserve memory for the crashkernel if the commandline argument
-points to a wrong location. This can happen if the location is specified
-wrong or if the same commandline is reused when starting the crashkernel
-- in the latter case the reserved memory would point to the location
-from which the crashkernel is executing.
-
-Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/14612/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/kernel/setup.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -585,6 +585,11 @@ static void __init mips_parse_crashkerne
-       if (ret != 0 || crash_size <= 0)
-               return;
- 
-+      if (!memory_region_available(crash_base, crash_size)) {
-+              pr_warn("Invalid memory region reserved for crash kernel\n");
-+              return;
-+      }
-+
-       crashk_res.start = crash_base;
-       crashk_res.end   = crash_base + crash_size - 1;
- }

diff --git a/queue-3.18/series b/queue-3.18/series
index 7e9f054a8856bdedce27b3e9d926bfab41aade04..08912eed531fd2146671c3b49d0fc962d2a2a7ee 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -1,7 +1,6 @@
 drm-bridge-add-dt-bindings-for-ti-ths8135.patch
 rds-rdma-fix-the-composite-message-user-notification.patch
 mips-ensure-bss-section-ends-on-a-long-aligned-address.patch
-mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch
 sh_eth-use-correct-name-for-ecmr_mpde-bit.patch
 hwmon-gl520sm-fix-overflows-and-crash-seen-when-writing-into-limit-attributes.patch
 arm-8635-1-nommu-allow-enabling-remap_vectors_to_ram.patch

diff --git a/queue-4.9/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch b/queue-4.9/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch
deleted file mode 100644 (file)
index b86b27a..0000000
--- a/queue-4.9/mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From foo@baz Thu Oct  5 10:28:31 CEST 2017
-From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-Date: Wed, 23 Nov 2016 14:43:50 +0100
-Subject: MIPS: kexec: Do not reserve invalid crashkernel memory on boot
-
-From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-
-
-[ Upstream commit a8f108d70c74d83574c157648383eb2e4285a190 ]
-
-Do not reserve memory for the crashkernel if the commandline argument
-points to a wrong location. This can happen if the location is specified
-wrong or if the same commandline is reused when starting the crashkernel
-- in the latter case the reserved memory would point to the location
-from which the crashkernel is executing.
-
-Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
-Cc: linux-mips@linux-mips.org
-Patchwork: https://patchwork.linux-mips.org/patch/14612/
-Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/mips/kernel/setup.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/arch/mips/kernel/setup.c
-+++ b/arch/mips/kernel/setup.c
-@@ -664,6 +664,11 @@ static void __init mips_parse_crashkerne
-       if (ret != 0 || crash_size <= 0)
-               return;
- 
-+      if (!memory_region_available(crash_base, crash_size)) {
-+              pr_warn("Invalid memory region reserved for crash kernel\n");
-+              return;
-+      }
-+
-       crashk_res.start = crash_base;
-       crashk_res.end   = crash_base + crash_size - 1;
- }

diff --git a/queue-4.9/series b/queue-4.9/series
index 0c2ebd70bdf6e32bb6707022b45d2fb1c0def7ee..f89a062acdf5367531ddf3156cd6adcaf2f67a9b 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -7,7 +7,6 @@ clk-sunxi-ng-fix-pll_cpux-adjusting-on-h3.patch
 rds-rdma-fix-the-composite-message-user-notification.patch
 arm-dts-r8a7790-use-r-car-gen-2-fallback-binding-for-msiof-nodes.patch
 mips-ensure-bss-section-ends-on-a-long-aligned-address.patch
-mips-kexec-do-not-reserve-invalid-crashkernel-memory-on-boot.patch
 mips-ralink-fix-a-typo-in-the-pinmux-setup.patch
 mips-ralink-fix-incorrect-assignment-on-ralink_soc.patch
 power-supply-axp288_fuel_gauge-fix-fuel_gauge_reg_readb-return-on-error.patch