Merge pull request #447 from jpoimboe/integration-test-fix

fix integration test patch conflict
2014-10-06 12:43:18 -05:00 · 2014-10-06 12:43:18 -05:00 · ea0ad69bbf
parent 78b4d3c70d 36150a8beb
commit ea0ad69bbf
1 changed files with 1 additions and 1 deletions
--- 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)
 {