linux-kernel - linux-next: manual merge of the renesas tree with the v4l-dvb 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]

Message-Id: <20130829181854.e380fb3508d41d88eb98f15d@canb.auug.org.au>
Date:	Thu, 29 Aug 2013 18:18:54 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Simon Horman <horms@...ge.net.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Laurent Pinchart <laurent.pinchart+renesas@...asonboard.com>,
	Vladimir Barinov <vladimir.barinov@...entembedded.com>,
	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
	Mauro Carvalho Chehab <mchehab@...radead.org>
Subject: linux-next: manual merge of the renesas tree with the v4l-dvb tree

Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/configs/marzen_defconfig between commit e0c332c671e7 ("[media]
ARM: shmobile: Marzen: enable VIN and ADV7180 in defconfig") from the
v4l-dvb tree and commit febedc9c9fe3 ("ARM: shmobile: marzen: Select
DRM_RCAR_DU in defconfig") from the renesas 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 arch/arm/configs/marzen_defconfig
index 000e920,26f30be..0000000
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@@ -85,13 -85,8 +85,15 @@@ CONFIG_GPIO_RCAR=
  CONFIG_THERMAL=y
  CONFIG_RCAR_THERMAL=y
  CONFIG_SSB=y
 +CONFIG_MEDIA_SUPPORT=y
 +CONFIG_MEDIA_CAMERA_SUPPORT=y
 +CONFIG_V4L_PLATFORM_DRIVERS=y
 +CONFIG_SOC_CAMERA=y
 +CONFIG_VIDEO_RCAR_VIN=y
 +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
 +CONFIG_VIDEO_ADV7180=y
+ CONFIG_DRM=y
+ CONFIG_DRM_RCAR_DU=y
  CONFIG_USB=y
  CONFIG_USB_RCAR_PHY=y
  CONFIG_MMC=y

Content of type "application/pgp-signature" skipped