From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752467AbbIXI5P (ORCPT ); Thu, 24 Sep 2015 04:57:15 -0400 Received: from mga11.intel.com ([192.55.52.93]:59119 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbbIXI5M (ORCPT ); Thu, 24 Sep 2015 04:57:12 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,580,1437462000"; d="scan'208";a="811891331" From: Jani Nikula To: Stephen Rothwell , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree In-Reply-To: <20150924112516.1dc9d5d3@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20150924112516.1dc9d5d3@canb.auug.org.au> User-Agent: Notmuch/0.20.2+57~gff3a03d (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 24 Sep 2015 11:57:05 +0300 Message-ID: <876130dwke.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 24 Sep 2015, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-intel tree got a conflict in: > > drivers/gpu/drm/i915/intel_display.c > > between commit: > > 721a09f7393d ("drm/i915: Add primary plane to mask if it's visible") > > from the drm-intel-fixes tree and commit: > > f9cd7b881a04 ("drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()") > > from the drm-intel tree. > > I fixed it up (I have no idea what do to here, so I just used the version > from the drm-intel tree) and can carry the fix as necessary (no action > is required - unless there is a better fix). That was the right thing to do. The former commit is headed for v4.3, and there will have to be another version of it for -next. This will cause you another conflict, and you should resolve it with the same approach. Thanks, Jani. -- Jani Nikula, Intel Open Source Technology Center