From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrea Arcangeli Subject: Re: Starting a VM reboots my machine Date: Tue, 6 Nov 2007 13:54:31 +0100 Message-ID: <20071106125431.GB19397@v2.random> References: <472A5561.5080202@cs.ualberta.ca> <64F9B87B6B770947A9F8391472E032160C95C59C@ehost011-8.exch011.intermedia.net> <20071104180538.GA6841@v2.random> <472F27BC.2060407@qumranet.com> <20071105151804.GB6841@v2.random> <472F35DD.7070905@qumranet.com> <20071105162836.GC6841@v2.random> <473030E0.9010301@qumranet.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Alexey Eremenko , kvm-devel To: Avi Kivity Return-path: Content-Disposition: inline In-Reply-To: <473030E0.9010301-atKUWr5tajBWk0Htik3J/w@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org On Tue, Nov 06, 2007 at 11:16:16AM +0200, Avi Kivity wrote: > Andrea Arcangeli wrote: >> On Mon, Nov 05, 2007 at 05:25:17PM +0200, Avi Kivity wrote: >> >>> Well, I can't find anything like that it my tree. Maybe something's >>> stale? >>> >> >> Could be, this is why I don't like git that much, with hg there would >> be no way that we could be looking at different trees. Anyway I agree >> it's mandatory for merging with Linus so... >> >> I started with "git clone >> git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git" some time >> > > btw, the easiest way to keep sync like that is 'git fetch origin'. That > gives you a branch 'origin/master' that is equivalent to the state of > kvm.git's master at the time of the fetch. I kept the bitrotten tree for tests like this, and specifying an older commit to reset --hard fixed the problem, the above probably would have worked too, thanks for the tips. Still I wonder how it went out of sync. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/