From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751594AbdFHCxh (ORCPT ); Wed, 7 Jun 2017 22:53:37 -0400 Received: from ozlabs.org ([103.22.144.67]:37065 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751435AbdFHCxg (ORCPT ); Wed, 7 Jun 2017 22:53:36 -0400 Date: Thu, 8 Jun 2017 12:53:33 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Jon Bloomfield , Chris Wilson Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20170608125333.3aea3070@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 Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_drv.h between commit: d86b18a06cf3 ("drm/i915: Serialize GTT/Aperture accesses on BXT") (which is also commit 0ef34ad6222a in the drm tree) from the drm-intel-fixes tree and commit: 80debff8d9af ("drm/i915: Consolidate #ifdef CONFIG_INTEL_IOMMU") from the drm tree. I fixed it up (I used the drm 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 tree with the drm-intel-fixes tree Date: Thu, 8 Jun 2017 12:53:33 +1000 Message-ID: <20170608125333.3aea3070@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: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Linux-Next Mailing List , Jon Bloomfield , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org SGkgRGF2ZSwKClRvZGF5J3MgbGludXgtbmV4dCBtZXJnZSBvZiB0aGUgZHJtIHRyZWUgZ290IGEg Y29uZmxpY3QgaW46CgogIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmgKCmJldHdlZW4g Y29tbWl0OgoKICBkODZiMThhMDZjZjMgKCJkcm0vaTkxNTogU2VyaWFsaXplIEdUVC9BcGVydHVy ZSBhY2Nlc3NlcyBvbiBCWFQiKQood2hpY2ggaXMgYWxzbyBjb21taXQgMGVmMzRhZDYyMjJhIGlu IHRoZSBkcm0gdHJlZSkKCmZyb20gdGhlIGRybS1pbnRlbC1maXhlcyB0cmVlIGFuZCBjb21taXQ6 CgogIDgwZGViZmY4ZDlhZiAoImRybS9pOTE1OiBDb25zb2xpZGF0ZSAjaWZkZWYgQ09ORklHX0lO VEVMX0lPTU1VIikKCmZyb20gdGhlIGRybSB0cmVlLgoKSSBmaXhlZCBpdCB1cCAoSSB1c2VkIHRo ZSBkcm0gdHJlZSB2ZXJzaW9uKSBhbmQgY2FuIGNhcnJ5IHRoZSBmaXggYXMKbmVjZXNzYXJ5LiBU aGlzIGlzIG5vdyBmaXhlZCBhcyBmYXIgYXMgbGludXgtbmV4dCBpcyBjb25jZXJuZWQsIGJ1dCBh bnkKbm9uIHRyaXZpYWwgY29uZmxpY3RzIHNob3VsZCBiZSBtZW50aW9uZWQgdG8geW91ciB1cHN0 cmVhbSBtYWludGFpbmVyCndoZW4geW91ciB0cmVlIGlzIHN1Ym1pdHRlZCBmb3IgbWVyZ2luZy4g IFlvdSBtYXkgYWxzbyB3YW50IHRvIGNvbnNpZGVyCmNvb3BlcmF0aW5nIHdpdGggdGhlIG1haW50 YWluZXIgb2YgdGhlIGNvbmZsaWN0aW5nIHRyZWUgdG8gbWluaW1pc2UgYW55CnBhcnRpY3VsYXJs eSBjb21wbGV4IGNvbmZsaWN0cy4KCi0tIApDaGVlcnMsClN0ZXBoZW4gUm90aHdlbGwKX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxp bmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJl ZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==