From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 27 Nov 2022 20:56:42 +0000 (+0100)
Subject: 5.4-stable patches
X-Git-Tag: v5.10.157~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4825faf80824ef6ea5fe831f5d0b3ac8dd702b99;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	lib-vdso-use-grep-e-instead-of-egrep.patch
---

diff --git a/queue-5.4/lib-vdso-use-grep-e-instead-of-egrep.patch b/queue-5.4/lib-vdso-use-grep-e-instead-of-egrep.patch
new file mode 100644
index 00000000000..45138456030
--- /dev/null
+++ b/queue-5.4/lib-vdso-use-grep-e-instead-of-egrep.patch
@@ -0,0 +1,33 @@
+From 8ac3b5cd3e0521d92f9755e90d140382fc292510 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Tue, 20 Sep 2022 19:06:33 +0200
+Subject: lib/vdso: use "grep -E" instead of "egrep"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit 8ac3b5cd3e0521d92f9755e90d140382fc292510 upstream.
+
+The latest version of grep claims the egrep is now obsolete so the build
+now contains warnings that look like:
+	egrep: warning: egrep is obsolescent; using grep -E
+fix this up by moving the vdso Makefile to use "grep -E" instead.
+
+Cc: Andy Lutomirski <luto@kernel.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
+Link: https://lore.kernel.org/r/20220920170633.3133829-1-gregkh@linuxfoundation.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/vdso/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/vdso/Makefile
++++ b/lib/vdso/Makefile
+@@ -17,6 +17,6 @@ $(error ARCH_REL_TYPE_ABS is not set)
+ endif
+ 
+ quiet_cmd_vdso_check = VDSOCHK $@
+-      cmd_vdso_check = if $(OBJDUMP) -R $@ | egrep -h "$(ARCH_REL_TYPE_ABS)"; \
++      cmd_vdso_check = if $(OBJDUMP) -R $@ | grep -E -h "$(ARCH_REL_TYPE_ABS)"; \
+ 		       then (echo >&2 "$@: dynamic relocations are not supported"; \
+ 			     rm -f $@; /bin/false); fi
diff --git a/queue-5.4/series b/queue-5.4/series
index 0a9247ac997..cd4a1ed3145 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -41,3 +41,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
+lib-vdso-use-grep-e-instead-of-egrep.patch