diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-24 17:38:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-24 17:38:18 +0100 |
| commit | 891da36cf2633b68baf820e89969a16600f3f85f (patch) | |
| tree | 2850998da0be7698757d03400aa5fc38ad11973b | |
| parent | 158352e138c236c33d1d561674063ac7ffe86680 (diff) | |
| download | patches-891da36cf2633b68baf820e89969a16600f3f85f.tar.gz | |
remove patch that is now in 6.2
| -rw-r--r-- | 0001-vsmp-driver.patch | 2 | ||||
| -rw-r--r-- | 0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch | 29 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | usb.patch | 2 |
4 files changed, 2 insertions, 32 deletions
diff --git a/0001-vsmp-driver.patch b/0001-vsmp-driver.patch index 0c44f9b5ec1388..88c94c386c7960 100644 --- a/0001-vsmp-driver.patch +++ b/0001-vsmp-driver.patch @@ -28,7 +28,7 @@ first cut to cleanup +Description: Shows the full version of the vSMP hypervisor --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -22328,6 +22328,12 @@ F: lib/test_printf.c +@@ -22364,6 +22364,12 @@ F: lib/test_printf.c F: lib/test_scanf.c F: lib/vsprintf.c diff --git a/0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch b/0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch deleted file mode 100644 index e0322f95d88458..00000000000000 --- a/0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 81da721534f3fe8c01428a1179ad70a50e2e34b8 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 21 Sep 2022 11:11:47 +0200 -Subject: [PATCH 3/3] scripts: coccicheck: use "grep -E" instead of "egrep" - -The latest version of grep claims that 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: Julia Lawall <Julia.Lawall@inria.fr> -Cc: Nicolas Palix <nicolas.palix@imag.fr> -Cc: cocci@inria.fr -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - scripts/coccicheck | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/scripts/coccicheck -+++ b/scripts/coccicheck -@@ -47,7 +47,7 @@ FLAGS="--very-quiet" - # inspected there. - # - # --profile will not output if --very-quiet is used, so avoid it. --echo $SPFLAGS | egrep -e "--profile|--show-trying" 2>&1 > /dev/null -+echo $SPFLAGS | grep -E -e "--profile|--show-trying" 2>&1 > /dev/null - if [ $? -eq 0 ]; then - FLAGS="--quiet" - fi @@ -1,7 +1,6 @@ # usb.patch 0001-vsmp-driver.patch -0003-scripts-coccicheck-use-grep-E-instead-of-egrep.patch 0001-driver-core-aux-test-code.patch copying.patch 0001-readfile-implement-readfile-syscall.patch diff --git a/usb.patch b/usb.patch index 693dfc235e3f2b..68f471ef2e2555 100644 --- a/usb.patch +++ b/usb.patch @@ -4,7 +4,7 @@ --- a/drivers/usb/storage/unusual_uas.h +++ b/drivers/usb/storage/unusual_uas.h -@@ -118,6 +118,17 @@ UNUSUAL_DEV(0x152d, 0x0578, 0x0000, 0x99 +@@ -111,6 +111,17 @@ UNUSUAL_DEV(0x152d, 0x0578, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BROKEN_FUA), |