From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754656AbcHXBmM (ORCPT ); Tue, 23 Aug 2016 21:42:12 -0400 Received: from ozlabs.org ([103.22.144.67]:35112 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753085AbcHXBmL (ORCPT ); Tue, 23 Aug 2016 21:42:11 -0400 Date: Wed, 24 Aug 2016 11:42:06 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Message-ID: <20160824114206.17c98d9d@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_display.c between commits from the drm-intel-fixes tree (some of which are cherry-picked from the drm-intel tree) and teh same and other commits from the drm-inte tree. These are just going to cause new conflicts every time you touch this file again in either tree (which happens a lot :-(). I fixed it up (see below) 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 only putting the fix patches into the drm-intel-fixes tree and then getting them into the drm-intel tree by merging the -fixes tree instead of cherry-picking them the other way. -- Cheers, Stephen Rothwell