From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Sean Young <sean@mess.org>,
Steve Longerbeam <steve_longerbeam@mentor.com>,
Shawn Guo <shawnguo@kernel.org>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with the arm-soc tree
Date: Mon, 4 Sep 2017 15:23:07 +1000 [thread overview]
Message-ID: <20170904152307.33f9ba2a@canb.auug.org.au> (raw)
In-Reply-To: <20170822105534.7f52bda0@canb.auug.org.au>
Hi all,
On Tue, 22 Aug 2017 10:55:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
>
> arch/arm/configs/imx_v6_v7_defconfig
>
> between commit:
>
> b834bc1c52b8 ("ARM: imx_v6_v7_defconfig: Enable staging video4linux drivers")
>
> from the arm-soc tree and commit:
>
> b9e1486e0e4b ("media: rc-core: do not depend on MEDIA_SUPPORT")
>
> from the v4l-dvb 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 arch/arm/configs/imx_v6_v7_defconfig
> index 3a48ad809731,1736813bdea7..000000000000
> --- a/arch/arm/configs/imx_v6_v7_defconfig
> +++ b/arch/arm/configs/imx_v6_v7_defconfig
> @@@ -230,9 -226,7 +230,9 @@@ CONFIG_REGULATOR_MC13892=
> CONFIG_REGULATOR_PFUZE100=y
> CONFIG_MEDIA_SUPPORT=y
> CONFIG_MEDIA_CAMERA_SUPPORT=y
> - CONFIG_MEDIA_RC_SUPPORT=y
> + CONFIG_RC_CORE=y
> +CONFIG_MEDIA_CONTROLLER=y
> +CONFIG_VIDEO_V4L2_SUBDEV_API=y
> CONFIG_RC_DEVICES=y
> CONFIG_IR_GPIO_CIR=y
> CONFIG_MEDIA_USB_SUPPORT=y
Just a reminder that this conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-09-04 5:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 0:55 linux-next: manual merge of the v4l-dvb tree with the arm-soc tree Stephen Rothwell
2017-09-04 5:23 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-12-08 0:04 Stephen Rothwell
2020-12-14 20:30 ` Stephen Rothwell
2020-12-14 21:05 ` Mauro Carvalho Chehab
2015-12-02 13:36 Mark Brown
2014-12-05 3:03 Stephen Rothwell
2014-12-01 2:52 Stephen Rothwell
2014-11-24 2:22 Stephen Rothwell
2014-11-24 15:28 ` Tony Lindgren
2012-01-11 2:31 Stephen Rothwell
2012-01-11 5:08 ` Olof Johansson
2012-01-11 8:36 ` Guennadi Liakhovetski
2012-01-11 10:35 ` Mauro Carvalho Chehab
2012-01-11 14:50 ` Arnd Bergmann
2012-01-11 15:09 ` Olof Johansson
2012-01-11 15:57 ` Nicolas Ferre
2012-01-11 16:44 ` Olof Johansson
2012-01-11 20:47 ` Mauro Carvalho Chehab
2012-01-11 16:46 ` Arnd Bergmann
2012-01-11 16:58 ` Olof Johansson
2012-01-11 17:56 ` Guennadi Liakhovetski
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=20170904152307.33f9ba2a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--cc=olof@lixom.net \
--cc=sean@mess.org \
--cc=shawnguo@kernel.org \
--cc=steve_longerbeam@mentor.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).