From 0325898de1cd2b051cccd8e06276c17c0b171a19 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 28 Aug 2019 11:13:05 +0200 Subject: [PATCH] add a s-o-b to a 4.14 patch --- ...perf-test-6-fix-missing-kvm-module-load-for-s.patch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch b/queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch index 6e883f0050a..663810dbf1c 100644 --- a/queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch +++ b/queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch @@ -11,12 +11,11 @@ Ben Hutchings reports that this commit depends on new code added in v4.18, and so is irrelevant on older kernels, and breaks the build. Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - tools/perf/tests/parse-events.c | 27 --------------------------- + tools/perf/tests/parse-events.c | 27 --------------------------- 1 file changed, 27 deletions(-) -diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c -index 424b82a7d0782..f0679613bd187 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -19,32 +19,6 @@ @@ -52,7 +51,7 @@ index 424b82a7d0782..f0679613bd187 100644 static int test__checkevent_tracepoint(struct perf_evlist *evlist) { struct perf_evsel *evsel = perf_evlist__first(evlist); -@@ -1626,7 +1600,6 @@ static struct evlist_test test__events[] = { +@@ -1626,7 +1600,6 @@ static struct evlist_test test__events[] { .name = "kvm-s390:kvm_s390_create_vm", .check = test__checkevent_tracepoint, @@ -60,6 +59,3 @@ index 424b82a7d0782..f0679613bd187 100644 .id = 100, }, #endif --- -2.20.1 - -- 2.47.3