From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756318AbbIXBZV (ORCPT ); Wed, 23 Sep 2015 21:25:21 -0400 Received: from ozlabs.org ([103.22.144.67]:56150 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751310AbbIXBZS (ORCPT ); Wed, 23 Sep 2015 21:25:18 -0400 Date: Thu, 24 Sep 2015 11:25:16 +1000 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maarten Lankhorst , Ville =?UTF-8?B?U3lyasOk?= =?UTF-8?B?bMOk?= Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Message-ID: <20150924112516.1dc9d5d3@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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 commit: 721a09f7393d ("drm/i915: Add primary plane to mask if it's visible") from the drm-intel-fixes tree and commit: f9cd7b881a04 ("drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()") from the drm-intel tree. I fixed it up (I have no idea what do to here, so I just used the version from the drm-intel tree) and can carry the fix as necessary (no action is required - unless there is a better fix). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au