Re: [kvm-devel] [GIT PULL] kvm oops fix

2007-04-21 Thread Avi Kivity
David Brown wrote: > On 4/19/07, Avi Kivity <[EMAIL PROTECTED]> wrote: >> Linus, >> >> Please pull from the 'linus' branch of >> >> git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git >> >> To get a one-liner fixing a host oops running non-pae guests. >> >> Avi Kivity (1): >> KVM: Fi

Re: [kvm-devel] [GIT PULL] kvm oops fix

2007-04-19 Thread David Brown
On 4/19/07, Avi Kivity <[EMAIL PROTECTED]> wrote: Linus, Please pull from the 'linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git To get a one-liner fixing a host oops running non-pae guests. Avi Kivity (1): KVM: Fix off-by-one when writing to a nonpae guest p

Re: [GIT PULL] kvm oops fix

2007-04-19 Thread Linus Torvalds
On Thu, 19 Apr 2007, Linus Torvalds wrote: > > You can either do > > git reset --hard ORIG_HEAD > git reset --hard @{1} Btw, on the same kind of subject: the whole "what was my previous HEAD" issues are obviously also how you'd generally want to see what those new patches were, r

Re: [GIT PULL] kvm oops fix

2007-04-19 Thread Linus Torvalds
On Thu, 19 Apr 2007, Jeff Garzik wrote: > > What is the easiest way to completely undo a pull, reverting the branch to the > HEAD present before the pull? You can either do git reset --hard ORIG_HEAD (git will set ORIG_HEAD before things like pulls or resets, so you can always go bac

Re: [kvm-devel] [GIT PULL] kvm oops fix

2007-04-19 Thread J. Bruce Fields
On Thu, Apr 19, 2007 at 03:34:01PM -0400, Jeff Garzik wrote: > David Brown wrote: > >>What is the easiest way to completely undo a pull, reverting the branch > >>to the HEAD present before the pull? > >> > > > >If the pull doesn't merge successfully then usually doing a `git-reset > >--hard` will b

Re: [kvm-devel] [GIT PULL] kvm oops fix

2007-04-19 Thread Jeff Garzik
David Brown wrote: What is the easiest way to completely undo a pull, reverting the branch to the HEAD present before the pull? If the pull doesn't merge successfully then usually doing a `git-reset --hard` will blow everything away back to normal, but Linus may do different things. I'm thin

Re: [kvm-devel] [GIT PULL] kvm oops fix

2007-04-19 Thread David Brown
What is the easiest way to completely undo a pull, reverting the branch to the HEAD present before the pull? If the pull doesn't merge successfully then usually doing a `git-reset --hard` will blow everything away back to normal, but Linus may do different things. - David Brown - To unsubscrib

Re: [GIT PULL] kvm oops fix

2007-04-19 Thread Jeff Garzik
Linus Torvalds wrote: On Thu, 19 Apr 2007, Avi Kivity wrote: Please pull from the 'linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git *please* put the branch-name after the git repo, so that I can cut-and-paste without noticing only afterwards that the diffstat doe

Re: [GIT PULL] kvm oops fix

2007-04-19 Thread Linus Torvalds
On Thu, 19 Apr 2007, Avi Kivity wrote: > > Please pull from the 'linus' branch of > > git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git *please* put the branch-name after the git repo, so that I can cut-and-paste without noticing only afterwards that the diffstat doesn't match what

[GIT PULL] kvm oops fix

2007-04-19 Thread Avi Kivity
Linus, Please pull from the 'linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git To get a one-liner fixing a host oops running non-pae guests. Avi Kivity (1): KVM: Fix off-by-one when writing to a nonpae guest pde --- drivers/kvm/mmu.c |1 + 1 files change