[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090902231214.495d4002@pedra.chehab.org>
Date: Wed, 2 Sep 2009 23:12:14 -0300
From: Mauro Carvalho Chehab <maurochehab@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Randy Dunlap <randy.dunlap@...cle.com>
Subject: Re: linux-next: manual merge of the v4l-dvb tree with Linus' tree
Em Wed, 2 Sep 2009 12:17:13 +1000
Stephen Rothwell <sfr@...b.auug.org.au> 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.
Thanks.
I've rebased it to fix this merge conflict between my devel tree and upstream.
You probably can drop it on your next merge.
Atenciosamente,
Prof. Mauro Carvalho Chehab, MSc, CISSP
maurochehab@...il.com
--
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/
Powered by blists - more mailing lists