Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753156Ab2F2JBt (ORCPT ); Fri, 29 Jun 2012 05:01:49 -0400 Received: from mail-yw0-f42.google.com ([209.85.213.42]:38982 "EHLO mail-yw0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652Ab2F2JBq (ORCPT ); Fri, 29 Jun 2012 05:01:46 -0400 MIME-Version: 1.0 X-Originating-IP: [178.83.130.250] In-Reply-To: <20120629133046.f6c65d4d6017d2ae486cfd2b@canb.auug.org.au> References: <20120629133046.f6c65d4d6017d2ae486cfd2b@canb.auug.org.au> Date: Fri, 29 Jun 2012 11:01:45 +0200 Message-ID: Subject: Re: linux-next: manual merge of the drm tree with Linus' tree From: Daniel Vetter To: Stephen Rothwell Cc: Dave Airlie , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1052 Lines: 26 On Fri, Jun 29, 2012 at 5:30 AM, Stephen Rothwell wrote: > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in > drivers/gpu/drm/i915/intel_display.c between commit 7aa1e7f06d6e ("Revert > "drm/i915: allow PCH PWM override on IVB"") from Linus' tree and commit > 7cf416014813 ("drm/i915: clear up backlight #define confusion on gen4+") > from the drm tree. > > The former removed the function ivb_pch_pwm_override() that is modified > by the latter, so I did that - or should I have just ignored the revert > patch? Nope, the revert should take precedence because that code is bogus - the change in -next is just replacing a magic value with a proper #define. Cheers, Daniel -- Daniel Vetter daniel.vetter@ffwll.ch - +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- 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/