From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760121Ab0JGHlm (ORCPT ); Thu, 7 Oct 2010 03:41:42 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:15023 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751173Ab0JGHll (ORCPT ); Thu, 7 Oct 2010 03:41:41 -0400 Date: Thu, 7 Oct 2010 09:41:29 +0200 From: Jean Delvare To: Stephen Rothwell Cc: Dave Airlie , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson Subject: Re: linux-next: manual merge of the drm tree with the i2c tree Message-ID: <20101007094129.5038bc9e@endymion.delvare> In-Reply-To: <20101007134220.d926a652.sfr@canb.auug.org.au> References: <20101007134220.d926a652.sfr@canb.auug.org.au> X-Mailer: Claws Mail 3.7.5 (GTK+ 2.20.1; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Thu, 7 Oct 2010 13:42:20 +1100, Stephen Rothwell wrote: > Today's linux-next merge of the drm tree got a conflict in > drivers/gpu/drm/i915/intel_i2c.c between commit > 2d3e8209c9d3abf6e831158e9814f50c57275487 ("i2c: Remove unneeded > inclusions of ") from the i2c tree and commit > f899fc64cda8569d0529452aafc0da31c042df2e ("drm/i915: use GMBUS to manage > i2c links") from the drm tree. > > Again, both commits removed the inclusion of linux/i2.-id.h, so I used > the drm tree verison. Thanks for the heads up. I've stripped the removal in the two conflicting files on my side, so it should be OK again. If there are more similar cases in the future, the resolution will be the same. -- Jean Delvare