Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree

From: Mauro Carvalho Chehab
Date: Wed Sep 02 2009 - 22:17:21 EST

Em Wed, 2 Sep 2009 12:17:13 +1000
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> escreveu:

> Hi Mauro,
> Today's linux-next merge of the v4l-dvb tree got a conflict in
> drivers/media/video/gspca/Kconfig between commit
> b6b85048c059e3f085095e48e12ed3f7a92c88d4 ("V4L/DVB (12502): gspca -
> sn9c20x: Fix gscpa sn9c20x build errors") from Linus' tree and commit
> 7b5ab5558fbce09584d8795bc91eb64d8c685782 ("V4L/DVB (12452):
> gspca/Kconfig: Fix bad identation for USB_GSPCA_SN9C20X_EVDEV") from the
> v4l-dvb tree.
> I fixed it up (see below) and will carry the fix for a while.


I've rebased it to fix this merge conflict between my devel tree and upstream.
You probably can drop it on your next merge.

Prof. Mauro Carvalho Chehab, MSc, CISSP
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at