From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbcFVBlC (ORCPT ); Tue, 21 Jun 2016 21:41:02 -0400 Received: from ozlabs.org ([103.22.144.67]:36454 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751579AbcFVBk7 (ORCPT ); Tue, 21 Jun 2016 21:40:59 -0400 Date: Wed, 22 Jun 2016 11:40:14 +1000 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lyude , Jani Nikula , Paulo Zanoni Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Message-ID: <20160622114014.19587383@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_fbc.c between commit: 1e3fa0acfec6 ("drm/i915/fbc: Disable on HSW by default for now") from the drm-intel-fixes tree and commit: 80788a0fbbdf ("drm/i915/fbc: sanitize i915.enable_fbc during FBC init") from the drm-intel tree. I fixed it up (since the former patch appears on both trees, I just used 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