From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Simon Horman <horms@verge.net.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>,
Vladimir Barinov <vladimir.barinov@cogentembedded.com>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
Mauro Carvalho Chehab <mchehab@infradead.org>
Subject: linux-next: manual merge of the renesas tree with the v4l-dvb tree
Date: Thu, 29 Aug 2013 18:18:54 +1000 [thread overview]
Message-ID: <20130829181854.e380fb3508d41d88eb98f15d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]
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@canb.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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
reply other threads:[~2013-08-29 8:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130829181854.e380fb3508d41d88eb98f15d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=horms@verge.net.au \
--cc=laurent.pinchart+renesas@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@infradead.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=vladimir.barinov@cogentembedded.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).