From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754113AbdFNAup (ORCPT ); Tue, 13 Jun 2017 20:50:45 -0400 Received: from ozlabs.org ([103.22.144.67]:34459 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753311AbdFNAun (ORCPT ); Tue, 13 Jun 2017 20:50:43 -0400 Date: Wed, 14 Jun 2017 10:50:41 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , Intel Graphics , DRI Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Ville =?UTF-8?B?U3lyasOkbMOk?= , Jani Nikula , Robert Foss Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20170614105041.5fccf277@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/intel_display.c between commit: 9a775e0308b5 ("drm/i915: Fix scaling check for 90/270 degree plane rotation") from the drm-intel-fixes tree and commit: c2c446ad2943 ("drm: Add DRM_MODE_ROTATE_ and DRM_MODE_REFLECT_ to UAPI") from the drm tree. I fixed it up (the former removed an instance of that was changed by the latter) 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