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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Stephen Rothwell
Date: Tuesday, April 29, 2008 - 8:49 pm

Hi Mauro,

On Tue, 29 Apr 2008 23:00:40 -0300 Mauro Carvalho Chehab <mchehab@infradead=
.org> wrote:
next
es are

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 betwee=
n commit 7c91f0624a9a2b8b9b122cf94fef34bc7f7347a6 ("V4L/DVB(7767): Move tun=
ers to common/tuners") in Linus' tree and commit 9c76e847539ab7a73e82ff6928=
62f3de9fa19ddb ("V4L/DVB(7767): Move tuners to common/tuners") in the v4l-d=
vb 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.
--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
linux-next: upstream build failure: v4l/dvb, Stephen Rothwell, (Tue Apr 29, 6:41 pm)
Re: linux-next: upstream build failure: v4l/dvb, Mauro Carvalho Chehab, (Tue Apr 29, 7:00 pm)
linux-next: v4l-dvb merge conflicts (Re: linux-next: upstr ..., Stephen Rothwell, (Tue Apr 29, 8:49 pm)
Re: linux-next: v4l-dvb merge conflicts (Re: linux-next: u ..., Mauro Carvalho Chehab, (Wed Apr 30, 12:12 pm)