From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Subject: Re: [PATCH 00/12] x86: disable virt on kdump and emergency_restart
	(v4)
Date: Fri, 21 Nov 2008 18:07:36 +0200
Message-ID: <4926DCC8.1040500@redhat.com>
References: <1226955804-16802-1-git-send-email-ehabkost@redhat.com>
	<20081118081501.GF17838@elte.hu>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Cc: Andrew Morton <akpm-3NddpPZAyC0@public.gmane.org>, Zachary Amsden <zach-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org>,
	Eduardo Habkost <ehabkost-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>, kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	"Rafael J. Wysocki" <rjw-KKrjLPT3xs0@public.gmane.org>, Haren Myneni <hbabu-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>,
	Simon Horman <horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>,
	"Eric W. Biederman" <ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org>,
	Andrey Borzenkov <arvidjaar-JGs/UdohzUI@public.gmane.org>, mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org,
	Vivek Goyal <vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>
Return-path: <kexec-bounces+glkk-kexec=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>
In-Reply-To: <20081118081501.GF17838-X9Un+BFzKDI@public.gmane.org>
List-Unsubscribe: <http://lists.infradead.org/mailman/listinfo/kexec>,
	<mailto:kexec-request-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org?subject=unsubscribe>
List-Archive: <http://lists.infradead.org/pipermail/kexec>
List-Post: <mailto:kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>
List-Help: <mailto:kexec-request-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org?subject=help>
List-Subscribe: <http://lists.infradead.org/mailman/listinfo/kexec>,
	<mailto:kexec-request-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org?subject=subscribe>
Sender: kexec-bounces-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Errors-To: kexec-bounces+glkk-kexec=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
List-Id: kvm.vger.kernel.org

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.