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: Fix off-by-one when writing to a nonpae guest pde
>
> Ooo I thought of something else.
> Should this be applied to the current 2.6.20.7 for the next 2.6.20.8
> release?
>

Yes.  I'll prepare a patch.


-- 
Do not meddle in the internals of kernels, for they are subtle and quick to 
panic.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


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 pde


Ooo I thought of something else.
Should this be applied to the current 2.6.20.7 for the next 2.6.20.8 release?

- David Brown
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


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 blow everything away back to normal, but Linus may do
> >different things.
> 
> I'm thinking about a successful pull that one later regrets :)

git reset --hard ORIG_HEAD, if the pull is the last thing you did.

Otherwise maybe fire up gitk, look for the point you'd like to revert
to, and cut-n-paste the SHA1 ID to the git reset --hard commandline.

--b.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


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 thinking about a successful pull that one later regrets :)

Jeff



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


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 unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/