From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-next@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Linus <torvalds@linux-foundation.org>
Subject: Re: linux-next: v4l-dvb merge conflicts (Re: linux-next: upstream build failure: v4l/dvb)
Date: Wed, 30 Apr 2008 16:12:24 -0300 [thread overview]
Message-ID: <20080430161224.71c154ca@gaivota> (raw)
In-Reply-To: <20080430134950.03b858e9.sfr@canb.auug.org.au>
On Wed, 30 Apr 2008 13:49:50 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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).
We've found some bugs that may explain what you've got. Anyway, most of they
are fixed. I'm preparing a pull request for Linus later today.
> 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 same patch were on both Linus and my tree. -git sometimes don't like
this ;)
Anyway, I've already dropped those patches that were already applied from my
tree. You should get a clean merge tomorrow.
Cheers,
Mauro
next prev parent reply other threads:[~2008-04-30 19:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-30 1:41 linux-next: upstream build failure: v4l/dvb Stephen Rothwell
2008-04-30 2:00 ` Mauro Carvalho Chehab
2008-04-30 3:49 ` linux-next: v4l-dvb merge conflicts (Re: linux-next: upstream build failure: v4l/dvb) Stephen Rothwell
2008-04-30 19:12 ` Mauro Carvalho Chehab [this message]
2008-05-01 0:37 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080430161224.71c154ca@gaivota \
--to=mchehab@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox