From 36150a8bebf912528b2dd1a688479fc7b49c7b92 Mon Sep 17 00:00:00 2001
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Mon, 6 Oct 2014 12:42:45 -0500
Subject: [PATCH] fix integration test patch conflict

---
 test/integration/module-kvm-fixup.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integration/module-kvm-fixup.patch b/test/integration/module-kvm-fixup.patch
index b44b935..0958133 100644
--- a/test/integration/module-kvm-fixup.patch
+++ b/test/integration/module-kvm-fixup.patch
@@ -2,7 +2,7 @@ Index: src/arch/x86/kvm/vmx.c
 ===================================================================
 --- src.orig/arch/x86/kvm/vmx.c
 +++ src/arch/x86/kvm/vmx.c
-@@ -8687,6 +8687,8 @@ static int vmx_check_intercept(struct kv
+@@ -8774,6 +8774,8 @@ static int vmx_check_intercept(struct kv
  			       struct x86_instruction_info *info,
  			       enum x86_intercept_stage stage)
  {