Re: [PATCH 00/12] x86: disable virt on kdump and emergency_restart (v4)

Avi Kivity
2008-11-21T16:07:36Z

Ingo Molnar wrote:
> * Eduardo Habkost <ehabkost-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>
>
>> Hi, Ingo,
>>
>> This is yet another spin of the series to disable vmx on kdump and
>> on emergency_restart, after some feedback from Avi.
>>
>
> this is going to interact with the KVM tree, wont it?
>
> i think the best way forward would be to keep your changes in the KVM
> tree.
>
> Lets try a Git trick for that. Avi could do that by pulling your other
> x86 changes from the x86 topic tree into the kvm tree. They are
> reviewed, acked and well-tested now, and kept in a separate tree so no
> other x86 change will be pulled in via them.
>
> We can do this if Avi can guarantee that these commits wont ever be
> rebased within KVM - then the two trees will merge up just fine in
> linux-next (and later in v2.6.29 as well), without any awkward merge
> dependencies or merge conflicts.
>

I never rebase kvm.git master, so I pulled the x86 changes and applied
all. Ingo, this will mean you have to push x86 before kvm.git, but as
you're generally faster than me there shouldn't be a problem.

Eduardo, please check the merge (there was a small conflict in reboot.c
which I fixed) once I push it. Also, when generating patches that move
files, use the -M switch: this makes it easier to review, and also
handles files that change better.

--
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.