From: Sasha Levin Date: Sun, 27 Nov 2022 23:05:54 +0000 (-0500) Subject: Fixes for 4.9 X-Git-Tag: v5.10.157~79 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d878b04309ba073e24cd83830051c9a0983f9230;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/nios2-add-force-for-vmlinuz.gz.patch b/queue-4.9/nios2-add-force-for-vmlinuz.gz.patch new file mode 100644 index 00000000000..caa4687d818 --- /dev/null +++ b/queue-4.9/nios2-add-force-for-vmlinuz.gz.patch @@ -0,0 +1,37 @@ +From a097133cd188aa0869ae980b11c6f29d9dba62fb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 23 Nov 2022 19:20:53 -0800 +Subject: nios2: add FORCE for vmlinuz.gz + +From: Randy Dunlap + +[ 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 +Reviewed-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + 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.9/series b/queue-4.9/series index 5d89c21254d..29661671800 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -17,3 +17,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