From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764049AbYD3S4j (ORCPT ); Wed, 30 Apr 2008 14:56:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758902AbYD3S41 (ORCPT ); Wed, 30 Apr 2008 14:56:27 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:51766 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758650AbYD3S40 (ORCPT ); Wed, 30 Apr 2008 14:56:26 -0400 Date: Wed, 30 Apr 2008 11:55:57 -0700 (PDT) From: Linus Torvalds To: Len Brown cc: Andrew Morton , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@lists.linux-foundation.org Subject: Re: [GIT PATCH] ACPI patches for 2.6.26-rc0 In-Reply-To: <200804301420.11696.lenb@kernel.org> Message-ID: References: <200804301420.11696.lenb@kernel.org> User-Agent: Alpine 1.10 (LFD 962 2008-03-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 30 Apr 2008, Len Brown wrote: > > please pull from: > > git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git release Ok, this clashed in some nasty ways in drivers/acpi/video.c due to the non-racy /proc file creation changes that came through Andrew. I fixed up the result, and it *looks* sane (and compiles), but I didn't actually test it, and I don't know the code well. Can you double-check. There were some (smaller) rejects in drivers/misc/intel_menlow.c due to two different versions of the same patch from Julia Lawall (again, the other came through Andrew), and I picked the one from Andrew because it had the later date. But again, you should double-check. Linus