From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162271AbcEaBAX (ORCPT ); Mon, 30 May 2016 21:00:23 -0400 Received: from ozlabs.org ([103.22.144.67]:34932 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161729AbcEaBAW (ORCPT ); Mon, 30 May 2016 21:00:22 -0400 Date: Tue, 31 May 2016 11:00:19 +1000 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Wilson , Ville =?UTF-8?B?U3lyasOkbMOk?= , Jani Nikula Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20160531110019.0758ead7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_gem.c between commit: 5fbd0418eef2 ("drm/i915: Re-enable GGTT earlier during resume on pre-gen6 platforms") (which also exists in the drm-intel tree as commit ac840ae53573) from Linus' tree and commit: d200cda6bd9f ("drm/i915: Remove early l3-remap") from the drm-intel tree. I fixed it up (I used the drm-intel tree version) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Date: Tue, 31 May 2016 11:00:19 +1000 Message-ID: <20160531110019.0758ead7@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: Jani Nikula , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org List-Id: linux-next.vger.kernel.org SGkgYWxsLAoKVG9kYXkncyBsaW51eC1uZXh0IG1lcmdlIG9mIHRoZSBkcm0taW50ZWwgdHJlZSBn b3QgYSBjb25mbGljdCBpbjoKCiAgZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9nZW0uYwoKYmV0 d2VlbiBjb21taXQ6CgogIDVmYmQwNDE4ZWVmMiAoImRybS9pOTE1OiBSZS1lbmFibGUgR0dUVCBl YXJsaWVyIGR1cmluZyByZXN1bWUgb24gcHJlLWdlbjYgcGxhdGZvcm1zIikKKHdoaWNoIGFsc28g ZXhpc3RzIGluIHRoZSBkcm0taW50ZWwgdHJlZSBhcyBjb21taXQgYWM4NDBhZTUzNTczKQoKZnJv bSBMaW51cycgdHJlZSBhbmQgY29tbWl0OgoKICBkMjAwY2RhNmJkOWYgKCJkcm0vaTkxNTogUmVt b3ZlIGVhcmx5IGwzLXJlbWFwIikKCmZyb20gdGhlIGRybS1pbnRlbCB0cmVlLgoKSSBmaXhlZCBp dCB1cCAoSSB1c2VkIHRoZSBkcm0taW50ZWwgdHJlZSB2ZXJzaW9uKSBhbmQgY2FuIGNhcnJ5IHRo ZSBmaXgKYXMgbmVjZXNzYXJ5LiBUaGlzIGlzIG5vdyBmaXhlZCBhcyBmYXIgYXMgbGludXgtbmV4 dCBpcyBjb25jZXJuZWQsIGJ1dAphbnkgbm9uIHRyaXZpYWwgY29uZmxpY3RzIHNob3VsZCBiZSBt ZW50aW9uZWQgdG8geW91ciB1cHN0cmVhbSBtYWludGFpbmVyCndoZW4geW91ciB0cmVlIGlzIHN1 Ym1pdHRlZCBmb3IgbWVyZ2luZy4gIFlvdSBtYXkgYWxzbyB3YW50IHRvIGNvbnNpZGVyCmNvb3Bl cmF0aW5nIHdpdGggdGhlIG1haW50YWluZXIgb2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8gbWlu aW1pc2UgYW55CnBhcnRpY3VsYXJseSBjb21wbGV4IGNvbmZsaWN0cy4KCi0tIApDaGVlcnMsClN0 ZXBoZW4gUm90aHdlbGwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg==