From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754531Ab0ATGMt (ORCPT ); Wed, 20 Jan 2010 01:12:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752598Ab0ATGMr (ORCPT ); Wed, 20 Jan 2010 01:12:47 -0500 Received: from vms173001pub.verizon.net ([206.46.173.1]:64469 "EHLO vms173001pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751416Ab0ATGMq (ORCPT ); Wed, 20 Jan 2010 01:12:46 -0500 Date: Wed, 20 Jan 2010 01:12:08 -0500 (EST) From: Len Brown X-X-Sender: lenb@localhost.localdomain To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Zhao Yakui , Eric Anholt Subject: Re: linux-next: manual merge of the acpi tree with Linus' tree In-reply-to: <20100118135624.011ee13b.sfr@canb.auug.org.au> Message-id: References: <20100118135624.011ee13b.sfr@canb.auug.org.au> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) 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 Thanks Stephen, I was carrying it because it was originally filed against ACPI, but now that Eric has it, I can drop my version. cheers, Len Brown, Intel Open Source Technology Center On Mon, 18 Jan 2010, Stephen Rothwell wrote: > Hi Len, > > Today's linux-next merge of the acpi tree got a conflict in > drivers/gpu/drm/i915/intel_lvds.c between commit > 40f33a92100f4d9b6e85ad642100cfe42d7ff57d ("drm/i915: Add HP > nx9020/SamsungSX20S to ACPI LID quirk list") from Linus' tree and commit > 25fbdd0b66c193607ed058662e06d29345766c17 ("drm/i915: Add HP > nx9020/Samsung SX20S to ACPI LID quirk list") from the acpi tree. > > Clearly two (slightly different) versions of the same change. I used the > version from the drm tree. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > http://www.canb.auug.org.au/~sfr/ >