From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754904AbcHXBmc (ORCPT ); Tue, 23 Aug 2016 21:42:32 -0400 Received: from ozlabs.org ([103.22.144.67]:33539 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752877AbcHXBma (ORCPT ); Tue, 23 Aug 2016 21:42:30 -0400 Date: Wed, 24 Aug 2016 11:32:26 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lyude , Maarten Lankhorst , Jani Nikula Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Message-ID: <20160824113226.3fbcc285@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/intel_drv.h between commit: f403372658fc ("drm/i915/skl: Add support for the SAGV, fix underrun hangs") (which is a chery-pick of commit 656d1b89e5ff from the drm-intel tree) from the drm-intel-fixes tree and commit: 62e0fb880123 ("drm/i915/skl: Update plane watermarks atomically during plane updates") from the drm-intel tree. I fixed it up (I just 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