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

[Ingo Molnar <mingo@elte.hu>]

* Avi Kivity <avi@redhat.com> wrote:

> Ingo Molnar wrote:
>> * Eduardo Habkost <ehabkost@redhat.com> 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.

Great!

Note that the dependencies are even more relaxed that that: you can 
push it too via the KVM tree, independently of the x86 push. Obviously 
you got those x86 changes from us x86 maintainers and they all work 
standalone too.

Pulling from each other means both sides agree on that sub-set of 
changes and trust each other - so there's no forced merge ordering or 
maintenance boundaries - any side can merge it upstream. (If you feel 
uneasy about it on any level, and were you to send a pull request 
first, then you can point it out to Linus in the pull request that you 
got those changes from us.)

	Ingo