From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Airlie Subject: Re: linux-next: manual merge of the drm tree with Linus' tree Date: Fri, 24 Aug 2012 17:12:34 +1000 Message-ID: References: <20120824121955.454ebce22142f238f89c9a9a@canb.auug.org.au> <87ehmwbw58.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: Received: from mail-qa0-f46.google.com ([209.85.216.46]:39215 "EHLO mail-qa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755100Ab2HXHMf (ORCPT ); Fri, 24 Aug 2012 03:12:35 -0400 In-Reply-To: <87ehmwbw58.fsf@intel.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Jani Nikula Cc: Stephen Rothwell , Dave Airlie , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Vetter On Fri, Aug 24, 2012 at 5:13 PM, Jani Nikula wrote: > On Fri, 24 Aug 2012, Stephen Rothwell wrote: >> Hi Dave, >> >> Today's linux-next merge of the drm tree got a conflict in >> drivers/gpu/drm/i915/intel_modes.c between commit 4eab81366465 >> ("drm/i915: extract connector update from intel_ddc_get_modes() for >> reuse") from Linus' tree and commit 451023dc32d4 ("drm: remove the >> raw_edid field from struct drm_display_info") from the drm tree. > > Ugh, both from me, sorry about that. Wasn't sure when or in what order > they'd go in. > >> I fixed it up (see below) and can carry the fix as necessary. > > I'm not quite sure what the patch below is against, but just removing > the reference to raw_edid from a slightly different place is the way to > go. Like you seem to do, so: > > Acked-by: Jani Nikula > > I can also provide a patch against drm-next if needed. That applied fine, I pulled it in for tomorrow -next. Dave.