Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/nios2-add-force-for-vmlinuz.gz.patch b/queue-4.14/nios2-add-force-for-vmlinuz.gz.patch
new file mode 100644 (file)
index 0000000..cbbff66
--- /dev/null
+++ b/queue-4.14/nios2-add-force-for-vmlinuz.gz.patch
@@ -0,0 +1,37 @@
+From 11a348b10830a544d6ab805b59f49d64415ed64f Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 23 Nov 2022 19:20:53 -0800
+Subject: nios2: add FORCE for vmlinuz.gz
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+[ Upstream commit 869e4ae4cd2a23d625aaa14ae62dbebf768cb77d ]
+
+Add FORCE to placate a warning from make:
+
+arch/nios2/boot/Makefile:24: FORCE prerequisite is missing
+
+Fixes: 2fc8483fdcde ("nios2: Build infrastructure")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Reviewed-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/nios2/boot/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile
+index c899876320df..76dce0a438a6 100644
+--- a/arch/nios2/boot/Makefile
++++ b/arch/nios2/boot/Makefile
+@@ -20,7 +20,7 @@ $(obj)/vmlinux.bin: vmlinux FORCE
+ $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
+       $(call if_changed,gzip)
+ 
+-$(obj)/vmImage: $(obj)/vmlinux.gz
++$(obj)/vmImage: $(obj)/vmlinux.gz FORCE
+       $(call if_changed,uimage)
+       @$(kecho) 'Kernel: $@ is ready'
+ 
+-- 
+2.35.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index e249d20836db575d30a9243b1bbc1c95d1fb1eb8..87c1a81bb4d780cc505b718637e0a8b45f3c8414 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -21,3 +21,4 @@ nfc-st-nci-fix-incorrect-validating-logic-in-evt_tra.patch
 nfc-st-nci-fix-memory-leaks-in-evt_transaction.patch
 net-thunderx-fix-the-acpi-memory-leak.patch
 s390-crashdump-fix-tod-programmable-field-size.patch
+nios2-add-force-for-vmlinuz.gz.patch