From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752005AbaLCIYB (ORCPT ); Wed, 3 Dec 2014 03:24:01 -0500 Received: from mga11.intel.com ([192.55.52.93]:26804 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751371AbaLCIYA (ORCPT ); Wed, 3 Dec 2014 03:24:00 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,506,1413270000"; d="scan'208";a="641739796" From: Jani Nikula To: Stephen Rothwell , Dave Airlie , 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 tree with the drm-intel-fixes tree In-Reply-To: <20141203132708.7423b7f8@canb.auug.org.au> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20141203132708.7423b7f8@canb.auug.org.au> User-Agent: Notmuch/0.19~rc1+1~g08b4944 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Wed, 03 Dec 2014 10:24:12 +0200 Message-ID: <87d281nntf.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 Wed, 03 Dec 2014, 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 b68362278af9 > ("drm/i915: More cautious with pch fifo underruns") from the > drm-intel-fixes tree and commit a72e4c9f9a11 ("drm/i915: Use dev_priv > in public intel_fifo_underrun.c functions") from the drm tree. > > I fixed it up (I used the drm tree version) and can carry the fix as > necessary (no action is required). b68362278af9 removes two lines of code; these should be removed in the resolved version too. BR, Jani. -- Jani Nikula, Intel Open Source Technology Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Date: Wed, 03 Dec 2014 10:24:12 +0200 Message-ID: <87d281nntf.fsf@intel.com> References: <20141203132708.7423b7f8@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20141203132708.7423b7f8@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Stephen Rothwell , Dave Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org T24gV2VkLCAwMyBEZWMgMjAxNCwgU3RlcGhlbiBSb3Rod2VsbCA8c2ZyQGNhbmIuYXV1Zy5vcmcu YXU+IHdyb3RlOgo+IEhpIERhdmUsCj4KPiBUb2RheSdzIGxpbnV4LW5leHQgbWVyZ2Ugb2YgdGhl IGRybSB0cmVlIGdvdCBhIGNvbmZsaWN0IGluCj4gZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxf ZGlzcGxheS5jIGJldHdlZW4gY29tbWl0IGI2ODM2MjI3OGFmOQo+ICgiZHJtL2k5MTU6IE1vcmUg Y2F1dGlvdXMgd2l0aCBwY2ggZmlmbyB1bmRlcnJ1bnMiKSBmcm9tIHRoZQo+IGRybS1pbnRlbC1m aXhlcyB0cmVlIGFuZCBjb21taXQgYTcyZTRjOWY5YTExICgiZHJtL2k5MTU6IFVzZSBkZXZfcHJp dgo+IGluIHB1YmxpYyBpbnRlbF9maWZvX3VuZGVycnVuLmMgZnVuY3Rpb25zIikgZnJvbSB0aGUg ZHJtIHRyZWUuCj4KPiBJIGZpeGVkIGl0IHVwIChJIHVzZWQgdGhlIGRybSB0cmVlIHZlcnNpb24p IGFuZCBjYW4gY2FycnkgdGhlIGZpeCBhcwo+IG5lY2Vzc2FyeSAobm8gYWN0aW9uIGlzIHJlcXVp cmVkKS4KCmI2ODM2MjI3OGFmOSByZW1vdmVzIHR3byBsaW5lcyBvZiBjb2RlOyB0aGVzZSBzaG91 bGQgYmUgcmVtb3ZlZCBpbiB0aGUKcmVzb2x2ZWQgdmVyc2lvbiB0b28uCgpCUiwKSmFuaS4KCgot LSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIFRlY2hub2xvZ3kgQ2VudGVyCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==