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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1939 bytes --]

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/rcar-du/Kconfig

between commit:

  a830a1567859 ("drm: rcar-du: Fix Kconfig dependency between RCAR_DU and RCAR_MIPI_DSI")

from Linus' tree and commit:

  7a043f978ed1 ("drm: rcar-du: Add RZ/G2L DSI driver")

from the drm tree.

I fixed it up (see below) 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

diff --cc drivers/gpu/drm/rcar-du/Kconfig
index fd2c2eaee26b,f14686549cbe..000000000000
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@@ -41,21 -41,22 +41,27 @@@ config DRM_RCAR_LVD
  	depends on DRM_RCAR_USE_LVDS
  	select DRM_KMS_HELPER
  	select DRM_PANEL
- 	select OF_FLATTREE
- 	select OF_OVERLAY
  
 -config DRM_RCAR_MIPI_DSI
 -	tristate "R-Car DU MIPI DSI Encoder Support"
 -	depends on DRM && DRM_BRIDGE && OF
 -	select DRM_MIPI_DSI
 +config DRM_RCAR_USE_MIPI_DSI
 +	bool "R-Car DU MIPI DSI Encoder Support"
 +	depends on DRM_BRIDGE && OF
 +	default DRM_RCAR_DU
  	help
  	  Enable support for the R-Car Display Unit embedded MIPI DSI encoders.
  
 +config DRM_RCAR_MIPI_DSI
 +	def_tristate DRM_RCAR_DU
 +	depends on DRM_RCAR_USE_MIPI_DSI
 +	select DRM_MIPI_DSI
 +
+ config DRM_RZG2L_MIPI_DSI
+ 	tristate "RZ/G2L MIPI DSI Encoder Support"
+ 	depends on DRM_BRIDGE && OF
+ 	depends on ARCH_RENESAS || COMPILE_TEST
+ 	select DRM_MIPI_DSI
+ 	help
+ 	  Enable support for the RZ/G2L Display Unit embedded MIPI DSI encoders.
+ 
  config DRM_RCAR_VSP
  	bool "R-Car DU VSP Compositor Support" if ARM
  	default y if ARM64

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]