From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Date: Fri, 22 Sep 2017 12:24:49 +1000 Message-ID: <20170922122449.0ada9f8d@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:45449 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751726AbdIVCYw (ORCPT ); Thu, 21 Sep 2017 22:24:52 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Daniel Vetter , Intel Graphics , DRI Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Maarten Lankhorst , Chris Wilson Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_display.c between commit: fd70075f82b7 ("drm/i915: Trim struct_mutex usage for kms") from Linus' tree and commits: 21a01abbe32a ("drm/atomic: Fix freeing connector/plane state too early by tracking commits, v3.") 669c9215afea ("drm/atomic: Make async plane update checks work as intended, v2.") from the drm-misc tree. I fixed it up (I basically used the latter version of the changes to intel_legacy_cursor_update()) 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