From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 May 2022 12:37:41 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.9.315~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f2e50c0bf8da566fce27f1672e5109b04afd0df;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	mips-fix-allmodconfig-build-with-latest-mkimage.patch
---

diff --git a/queue-4.19/mips-fix-allmodconfig-build-with-latest-mkimage.patch b/queue-4.19/mips-fix-allmodconfig-build-with-latest-mkimage.patch
new file mode 100644
index 00000000000..238ef3b45a1
--- /dev/null
+++ b/queue-4.19/mips-fix-allmodconfig-build-with-latest-mkimage.patch
@@ -0,0 +1,56 @@
+From sudipm.mukherjee@gmail.com  Mon May 16 14:31:06 2022
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Date: Sat, 14 May 2022 16:34:14 +0100
+Subject: MIPS: fix allmodconfig build with latest mkimage
+To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: stable@vger.kernel.org, Sudip Mukherjee <sudipm.mukherjee@gmail.com>, Nathan Chancellor <nathan@kernel.org>
+Message-ID: <20220514153414.6190-1-sudip.mukherjee@sifive.com>
+
+From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+
+With the latest mkimage from U-Boot 2021.04+ the allmodconfig build
+fails. 822564cd3aa1 ("MIPS: generic: Update node names to avoid unit
+addresses") was applied for similar build failure, but it was not
+applied to 'arch/mips/generic/board-ocelot_pcb123.its.S' as that was
+removed from upstream when the patch was applied.
+
+Fixes: 822564cd3aa1 ("MIPS: generic: Update node names to avoid unit addresses")
+Cc: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Reviewed-by: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/mips/generic/board-ocelot_pcb123.its.S |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/arch/mips/generic/board-ocelot_pcb123.its.S
++++ b/arch/mips/generic/board-ocelot_pcb123.its.S
+@@ -1,23 +1,23 @@
+ /* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
+ / {
+ 	images {
+-		fdt@ocelot_pcb123 {
++		fdt-ocelot_pcb123 {
+ 			description = "MSCC Ocelot PCB123 Device Tree";
+ 			data = /incbin/("boot/dts/mscc/ocelot_pcb123.dtb");
+ 			type = "flat_dt";
+ 			arch = "mips";
+ 			compression = "none";
+-			hash@0 {
++			hash {
+ 				algo = "sha1";
+ 			};
+ 		};
+ 	};
+ 
+ 	configurations {
+-		conf@ocelot_pcb123 {
++		conf-ocelot_pcb123 {
+ 			description = "Ocelot Linux kernel";
+-			kernel = "kernel@0";
+-			fdt = "fdt@ocelot_pcb123";
++			kernel = "kernel";
++			fdt = "fdt-ocelot_pcb123";
+ 		};
+ 	};
+ };
diff --git a/queue-4.19/series b/queue-4.19/series
index 95e9cfca0d8..7d49a6a7b61 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -27,3 +27,4 @@ usb-serial-option-add-fibocom-ma510-modem.patch
 slimbus-qcom-fix-irq-check-in-qcom_slim_probe.patch
 cgroup-cpuset-remove-cpus_allowed-mems_allowed-setup-in-cpuset_init_smp.patch
 drm-vmwgfx-initialize-drm_mode_fb_cmd2.patch
+mips-fix-allmodconfig-build-with-latest-mkimage.patch