linux-kernel - linux-next: manual merge of the drm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 7 Dec 2015 14:38:34 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Dave Airlie <airlied@...ux.ie>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Archit Taneja <architt@...eaurora.org>,
	Daniel Vetter <daniel.vetter@...ll.ch>,
	Markus Elfring <elfring@...rs.sourceforge.net>,
	Philipp Zabel <p.zabel@...gutronix.de>
Subject: linux-next: manual merge of the drm tree with Linus' tree

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@...b.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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/