From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423601AbcFNCKK (ORCPT ); Mon, 13 Jun 2016 22:10:10 -0400 Received: from ozlabs.org ([103.22.144.67]:54961 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161388AbcFNCKI (ORCPT ); Mon, 13 Jun 2016 22:10:08 -0400 Date: Tue, 14 Jun 2016 12:10:06 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville =?UTF-8?B?U3lyasOkbMOk?= , Chris Wilson Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20160614121006.43eec824@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: a5aac5ab876a ("drm/i915: Check VBT for port presence in addition to the strap on VLV/CHV") from the drm-intel-fixes tree and commit: 457c52d87e5d ("drm/i915: Only ignore eDP ports that are connected") (which is also in the drm-intel-fixes tree) from the drm tree. I fixed it up (I used the version form the drm-intel-fixes tree) 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