linux-next: v4l-dvb merge conflicts (Re: linux-next: upstream build failure: v4l/dvb)

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]

Hi Mauro,

On Tue, 29 Apr 2008 23:00:40 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> On Wed, 30 Apr 2008 11:41:24 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > Today's linux-next build (Linus' tree, x86_64 allmodconfig) fails like
> > this:
> > 
> > ERROR: "tea5767_autodetection" [drivers/media/video/tuner.ko] undefined!
> > ERROR: "tda829x_probe" [drivers/media/video/tuner.ko] undefined!
> > ERROR: "tea5761_autodetection" [drivers/media/video/tuner.ko] undefined!
> 
> I suspect that something wrong happened on your compilation, or at linux-next
> merge. Those three drivers (tea5767, tea5761 and tea829x) were moved
> from /drivers/media/video to /drivers/common/tuners, but the above messages are
> pointing to the old path.

OK, interesting.  This was a build of just Linus' tree so others may get
this problem if they don't do a "make clean" or similar (as I don't).

I have now done the merge of the v4l-dvb tree in linux-next and I have had several conflicts, the worst being in the file drivers/media/Kconfig between commit 7c91f0624a9a2b8b9b122cf94fef34bc7f7347a6 ("V4L/DVB(7767): Move tuners to common/tuners") in Linus' tree and commit 9c76e847539ab7a73e82ff692862f3de9fa19ddb ("V4L/DVB(7767): Move tuners to common/tuners") in the v4l-dvb tree.  The former leaves

source "drivers/media/common/Kconfig"

while the latter removes it.  I suspect I have a bad version of the
v4l-dvb/stable tree (though I did fetch it this morning).

I managed to fix it all up to the point that it builds, though.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]