On Mon, Nov 05, 2007 at 05:25:17PM +0200, Avi Kivity wrote:
> Well, I can't find anything like that it my tree. Maybe something's stale?
Could be, this is why I don't like git that much, with hg there would
be no way that we could be looking at different trees. Anyway I agree
it's mandatory for merging with Linus so...
I started with "git clone
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git" some time
ago and I kept pulling over and over again. Sometime I had to run 'git
reset --hard', sometime 'git checkout' followed by 'git checkout
master', and the below is what I got right now.
[EMAIL PROTECTED] ~/kernel/kvm $ git reset --hard
HEAD is now at dfe6652... Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
[EMAIL PROTECTED] ~/kernel/kvm $ patch -p1 </tmp/z
patching file drivers/kvm/svm.c
[EMAIL PROTECTED] ~/kernel/kvm $ git reset --hard
HEAD is now at dfe6652... Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
[EMAIL PROTECTED] ~/kernel/kvm $ patch -p1 </tmp/z
patching file drivers/kvm/svm.c
[EMAIL PROTECTED] ~/kernel/kvm $
See, it applies cleanly here on top of kvm.git master.
Now I'm re-downloding the entire kvm.git and see if what I get is a
different tree and if my previous kvm.git bitrotten.
> It does.
Ok.
> We're definitely looking at different trees.
here my current tip.
commit dfe665260be338e3a7fe59172220ccadd2d1b7e7
Merge: 8c37564... c388ba8...
Author: Andrea Arcangeli <[EMAIL PROTECTED]>
Date: Sun Nov 4 13:00:47 2007 +0100
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm
commit c388ba81841a1ed30a5dd4f6029db2263ad1aca3
Author: Hollis Blanchard <[EMAIL PROTECTED]>
Date: Thu Nov 1 14:16:10 2007 -0500
KVM: Portability: Move x86 vcpu ioctl handlers to x86.c
Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
commit a9acc2800d8676d8a9a91aeaedd16ae4f75c05df
Author: Hollis Blanchard <[EMAIL PROTECTED]>
Date: Wed Oct 31 17:24:25 2007 -0500
KVM: Portability: Move x86 FPU handling to x86.c
Signed-off-by: Hollis Blanchard <[EMAIL PROTECTED]>
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
