linux-kernel - Re: [PATCH 00/12] x86: disable virt on kdump and emergency

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4926DCC8.1040500@redhat.com>
Date:	Fri, 21 Nov 2008 18:07:36 +0200
From:	Avi Kivity <avi@...hat.com>
To:	Ingo Molnar <mingo@...e.hu>
CC:	Eduardo Habkost <ehabkost@...hat.com>,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	Simon Horman <horms@...ge.net.au>,
	Andrew Morton <akpm@...l.org>, Vivek Goyal <vgoyal@...hat.com>,
	Haren Myneni <hbabu@...ibm.com>,
	Andrey Borzenkov <arvidjaar@...l.ru>, mingo@...hat.com,
	"Rafael J. Wysocki" <rjw@...k.pl>,
	Zachary Amsden <zach@...are.com>, kexec@...ts.infradead.org,
	kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 00/12] x86: disable virt on kdump and emergency_restart
 (v4)

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

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.

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