linux-kernel - RE: linux-next: manual merge of the v4l-dvb 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Tue, 11 May 2010 10:49:37 +0530
From:	"Hiremath, Vaibhav" <hvaibhav@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Mauro Carvalho Chehab <mchehab@...radead.org>
CC:	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Guennadi Liakhovetski <g.liakhovetski@....de>
Subject: RE: linux-next: manual merge of the v4l-dvb tree with Linus' tree

> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@...b.auug.org.au]
> Sent: Monday, May 10, 2010 6:03 AM
> To: Mauro Carvalho Chehab
> Cc: linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; Guennadi
> Liakhovetski; Hiremath, Vaibhav
> Subject: linux-next: manual merge of the v4l-dvb tree with Linus' tree
> 
> Hi Mauro,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/Makefile between commit
> b704e82a54591d69816b45f4324caf143f1a6fc8 ("V4L/DVB: V4L - Makfile:Removed
> duplicate entry of davinci") from Linus' tree and commit
> 3b5ce90284aff5f8683cfd08e0e1b38f73ad0aa8 ("V4L/DVB: V4L: SuperH Video
> Output Unit (VOU) driver") from the v4l-dvb tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix
> for a while.
[Hiremath, Vaibhav] Thanks Stephen,

Looks ok to me.

Thanks,
Vaibhav

> --
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc drivers/media/video/Makefile
> index c51c386,cc93859..0000000
> --- a/drivers/media/video/Makefile
> +++ b/drivers/media/video/Makefile
> @@@ -160,6 -166,10 +166,8 @@@ obj-$(CONFIG_VIDEO_MX3)			+=
> mx3_camera
>   obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
>   obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
> 
>  -obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/
>  -
> + obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
> +
>   obj-$(CONFIG_VIDEO_AU0828) += au0828/
> 
>   obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/
--
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/