From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751438AbbHQDXd (ORCPT ); Sun, 16 Aug 2015 23:23:33 -0400 Received: from ozlabs.org ([103.22.144.67]:50615 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750848AbbHQDXb (ORCPT ); Sun, 16 Aug 2015 23:23:31 -0400 Date: Mon, 17 Aug 2015 13:23:27 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Maarten Lankhorst , Jani Nikula Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree Message-ID: <20150817132327.7637ec22@canb.auug.org.au> X-Mailer: Claws Mail 3.11.1 (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 Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/intel_atomic.c drivers/gpu/drm/i915/intel_display.c between commits: f0fdc55db0c6 ("drm/i915: calculate primary visibility changes instead of calling from set_config") d2944cf21305 ("drm/i915: Commit planes on each crtc separately.") from the drm-intel-fixes tree and commit: 74c090b1bdc5 ("drm/i915: Use full atomic modeset.") and maybe others from the drm tree. I fixed it up (both these former commits are based on commits in the latter tree, so I just used the latter tree versions) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au