From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760765AbbLCPug (ORCPT ); Thu, 3 Dec 2015 10:50:36 -0500 Received: from mga02.intel.com ([134.134.136.20]:1671 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760615AbbLCPuc (ORCPT ); Thu, 3 Dec 2015 10:50:32 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,378,1444719600"; d="scan'208";a="865932642" From: Jani Nikula To: Mark Brown , Dave Airlie , Ville =?utf-8?B?U3lyasOkbMOk?= , Imre Deak Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree In-Reply-To: <20151203145139.512bebac25c08506a1791a5b@kernel.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20151203145139.512bebac25c08506a1791a5b@kernel.org> User-Agent: Notmuch/0.20.2+101~gb57168b (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Thu, 03 Dec 2015 17:49:16 +0200 Message-ID: <87h9jz1qir.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, 03 Dec 2015, Mark Brown wrote: > Hi Dave, > > Today's linux-next merge of the drm tree got a conflict in > drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915: > Introduce a gmbus power domain") from the drm-intel-fixes tree and commit > 69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed > during HDMI detect") from the drm tree. > > I fixed it up (again resulting in a null diff) and can carry the fix as > necessary (no action is required). Both of these were due to backporting of five patches from our -next aiming at v4.5 to our -fixes aiming at v4.4. Some more details in my pull request to Dave [1]. BR, Jani. [1] http://mid.gmane.org/87mvtr1t6n.fsf@intel.com -- Jani Nikula, Intel Open Source Technology Center