From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755447AbbLGDih (ORCPT ); Sun, 6 Dec 2015 22:38:37 -0500 Received: from ozlabs.org ([103.22.144.67]:37690 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755165AbbLGDig (ORCPT ); Sun, 6 Dec 2015 22:38:36 -0500 Date: Mon, 7 Dec 2015 14:38:34 +1100 From: Stephen Rothwell To: Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Archit Taneja , Daniel Vetter , Markus Elfring , Philipp Zabel Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20151207143834.366ea1bf@canb.auug.org.au> X-Mailer: Claws Mail 3.13.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 Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/imx-drm-core.c between commit: 3f3a7280d4ca ("GPU-DRM-IMX: Delete an unnecessary check before drm_fbdev_cma_restore_mode()") from Linus' tree and commit: c1ff5a7aa3c3 ("drm/imx: Remove local fbdev emulation Kconfig option") from the drm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/imx/imx-drm-core.c index 7b990b4e96d2,6faa735376ec..000000000000 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@@ -60,11 -62,10 +62,9 @@@ EXPORT_SYMBOL_GPL(imx_drm_crtc_id) static void imx_drm_driver_lastclose(struct drm_device *drm) { - #if IS_ENABLED(CONFIG_DRM_IMX_FB_HELPER) struct imx_drm_device *imxdrm = drm->dev_private; - if (imxdrm->fbhelper) - drm_fbdev_cma_restore_mode(imxdrm->fbhelper); + drm_fbdev_cma_restore_mode(imxdrm->fbhelper); - #endif } static int imx_drm_driver_unload(struct drm_device *drm)