From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: Please pull ACPI updates Date: Wed, 16 Jul 2008 19:26:45 -0700 Message-ID: <200807161926.45975.jbarnes@virtuousgeek.org> References: <20080716214516.GA10777@basil.nowhere.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from outbound-mail-07.bluehost.com ([69.89.17.207]:59526 "HELO outbound-mail-07.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752738AbYGQC0z (ORCPT ); Wed, 16 Jul 2008 22:26:55 -0400 In-Reply-To: Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Linus Torvalds Cc: "Rafael J. Wysocki" , Andi Kleen , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org 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