root@ujvl:/usr/src # svn stat M Makefile ? Makefile.orig M sys/amd64/amd64/machdep.c ? sys/amd64/amd64/machdep.c.orig M sys/amd64/include/pcpu.h ? sys/amd64/include/pcpu.h.orig M sys/conf/files ? sys/conf/files.orig M sys/conf/options.amd64 ? sys/conf/options.amd64.orig M sys/conf/options.i386 ? sys/conf/options.i386.orig M sys/i386/include/pcpu.h ? sys/i386/include/pcpu.h.orig M sys/modules/Makefile ? sys/modules/Makefile.orig ? sys/xen/xenhvm_mod.c ? sys/xen/xenhvm_mod.c.orig ------------------------------------------------------------------- root@ujvl:/usr/src # patch < ~sbruno/mod_xenhvm.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/amd64/amd64/machdep.c |=================================================================== |--- sys/amd64/amd64/machdep.c (revision 254941) |+++ sys/amd64/amd64/machdep.c (working copy) -------------------------- Patching file sys/amd64/amd64/machdep.c using Plan A... Hunk #1 succeeded at 1910. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/amd64/conf/XENHVM |=================================================================== |--- sys/amd64/conf/XENHVM (revision 254941) |+++ sys/amd64/conf/XENHVM (working copy) -------------------------- Patching file sys/amd64/conf/XENHVM using Plan A... Empty context always matches. Hunk #1 failed at 0. 1 out of 1 hunks failed--saving rejects to sys/amd64/conf/XENHVM.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/amd64/include/pcpu.h |=================================================================== |--- sys/amd64/include/pcpu.h (revision 254941) |+++ sys/amd64/include/pcpu.h (working copy) -------------------------- Patching file sys/amd64/include/pcpu.h using Plan A... Hunk #1 succeeded at 42. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/conf/files |=================================================================== |--- sys/conf/files (revision 254941) |+++ sys/conf/files (working copy) -------------------------- Patching file sys/conf/files using Plan A... Hunk #1 succeeded at 2490. Hunk #2 succeeded at 3811. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/conf/options.amd64 |=================================================================== |--- sys/conf/options.amd64 (revision 254941) |+++ sys/conf/options.amd64 (working copy) -------------------------- Patching file sys/conf/options.amd64 using Plan A... Hunk #1 succeeded at 64. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/conf/options.i386 |=================================================================== |--- sys/conf/options.i386 (revision 254941) |+++ sys/conf/options.i386 (working copy) -------------------------- Patching file sys/conf/options.i386 using Plan A... Hunk #1 succeeded at 119. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/i386/conf/XENHVM |=================================================================== |--- sys/i386/conf/XENHVM (revision 254941) |+++ sys/i386/conf/XENHVM (working copy) -------------------------- Patching file sys/i386/conf/XENHVM using Plan A... Empty context always matches. Hunk #1 failed at 0. 1 out of 1 hunks failed--saving rejects to sys/i386/conf/XENHVM.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/i386/include/pcpu.h |=================================================================== |--- sys/i386/include/pcpu.h (revision 254941) |+++ sys/i386/include/pcpu.h (working copy) -------------------------- Patching file sys/i386/include/pcpu.h using Plan A... Hunk #1 succeeded at 77. Hunk #2 succeeded at 84. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/modules/Makefile |=================================================================== |--- sys/modules/Makefile (revision 254941) |+++ sys/modules/Makefile (working copy) -------------------------- Patching file sys/modules/Makefile using Plan A... Hunk #1 succeeded at 363. Hunk #2 succeeded at 371. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/modules/xenhvm/Makefile |=================================================================== |--- sys/modules/xenhvm/Makefile (revision 0) |+++ sys/modules/xenhvm/Makefile (working copy) -------------------------- Patching file Makefile using Plan A... Empty context always matches. Hunk #1 succeeded at 1. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: sys/xen/xenhvm_mod.c |=================================================================== |--- sys/xen/xenhvm_mod.c (revision 0) |+++ sys/xen/xenhvm_mod.c (working copy) -------------------------- (Creating file sys/xen/xenhvm_mod.c...) Patching file sys/xen/xenhvm_mod.c using Plan A... Empty context always matches. Hunk #1 succeeded at 1. done