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