From 0310b312a7e5dffcdf24ae835ed732f7a6a9c471 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jcline@redhat.com>
Date: Tue, 14 Apr 2020 17:53:23 -0400
Subject: kernel-5.7.0-0.rc1.20200414git8632e9b5645b.1

This is an automated commit generated from the
kernel-5.7.0-0.rc1.20200414git8632e9b5645b.1 tag in
https://gitlab.com/cki-project/kernel-ark.git
---
 ...vm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch | 28 ----------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch

(limited to '0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch')

diff --git a/0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch b/0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch
deleted file mode 100644
index 9d2694b32..000000000
--- a/0001-Include-kvm_asm.h-and-kvm_arm.h-in-kvm-arm-trace.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3f16f4a34eeb22d70afe1bebdd2cfcded179f22a Mon Sep 17 00:00:00 2001
-From: Jeremy Cline <jcline@redhat.com>
-Date: Tue, 4 Feb 2020 15:31:19 -0500
-Subject: [PATCH] Include kvm_asm.h and kvm_arm.h in kvm/arm/trace.h
-
-commit 0e20f5e25556 maybe broke this.
-
-Signed-off-by: Jeremy Cline <jcline@redhat.com>
----
- virt/kvm/arm/trace.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/virt/kvm/arm/trace.h b/virt/kvm/arm/trace.h
-index 204d210d01c2..1c88e60a6b00 100644
---- a/virt/kvm/arm/trace.h
-+++ b/virt/kvm/arm/trace.h
-@@ -4,6 +4,8 @@
- 
- #include <kvm/arm_arch_timer.h>
- #include <linux/tracepoint.h>
-+#include <asm/kvm_asm.h>
-+#include <asm/kvm_arm.h>
- 
- #undef TRACE_SYSTEM
- #define TRACE_SYSTEM kvm
--- 
-2.24.1
-
-- 
cgit