DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org;
	h=Received:From:To:Subject:Date:User-Agent:Cc:References:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-Disposition:Message-Id:X-Identified-User:DomainKey-Status;
	b=rSRcHuoQDKptPNMFIt6Flv/92QXe8dmPoaYs/b2nBxnL5/CxTfOBXRZgNMzhjclSkwoj8yJT7mtOdSQB4EGIKBjSd7TqJYuaQtvFm96JSeFFjUyPXwHsO0l6VTF81g0Y;
From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: Please pull ACPI updates
Date: Wed, 16 Jul 2008 19:26:45 -0700
User-Agent: KMail/1.9.9
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>, Andi Kleen <andi@firstfloor.org>,
       linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org
References: <20080716214516.GA10777@basil.nowhere.org> <alpine.LFD.1.10.0807161728560.2835@woody.linux-foundation.org> <alpine.LFD.1.10.0807161751490.2959@woody.linux-foundation.org>
In-Reply-To: <alpine.LFD.1.10.0807161751490.2959@woody.linux-foundation.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200807161926.45975.jbarnes@virtuousgeek.org>
DomainKey-Status: no signature
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1509
Lines: 34

On Wednesday, July 16, 2008 5:53:55 pm Linus Torvalds wrote:
> On Wed, 16 Jul 2008, Linus Torvalds wrote:
> > Well, I haven't actually seen Len's original tree, so maybe the stuff
> > Andi pushed was just the stuff he had queued up independently. I guess I
> > shouldn't judge before I'm sure.
>
> No, he rebased it - the three commits you shared are now separate ones.

Well, I could have misunderstood what we talked about; I guess I just assumed 
Andi & I would chat before sending out our pull requests.  I'll be sure to 
coordinate better next time.

> Most of the conflicts seem to have been due tot he x86 tree changes
> though. But it seems I didn't mess up too much: at least the result booted
> for me without complaints. So I pushed out my resolution.
>
> Jesse, can you please double-check it?

Just looked, seems fine.  I'd pat you on the head to reassure you about it, 
but my arms aren't quite long enough...

I'll dig around some more for git best practices too.  Based on what I've seen 
of the x86 tree I don't have nearly enough branches (though on the plus side, 
I almost never rebase since I don't want to hose any downstream users, and I 
don't merge from your tree until after you've pulled to avoid cluttering up 
the log).

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