RepoMirrors
/
kpatch
mirror of https://github.com/dynup/kpatch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

fix integration test patch conflict
This commit is contained in:
Josh Poimboeuf 2014-10-06 12:43:18 -05:00
parent 78b4d3c70d 36150a8beb
commit ea0ad69bbf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/module-kvm-fixup.patch
View File

@ -2,7 +2,7 @@ Index: src/arch/x86/kvm/vmx.c
=================================================================== ===================================================================
--- src.orig/arch/x86/kvm/vmx.c --- src.orig/arch/x86/kvm/vmx.c
+++ src/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, struct x86_instruction_info *info,
enum x86_intercept_stage stage) enum x86_intercept_stage stage)
{ {