linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mauro Carvalho Chehab <mchehab@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jean Delvare <khali@linux-fr.org>
Subject: Re: linux-next: build failure after merge of the v4l-dvb tree
Date: Tue, 28 Sep 2010 22:40:05 -0300	[thread overview]
Message-ID: <4CA298F5.40309@infradead.org> (raw)
In-Reply-To: <20100929112904.3fd117e0.sfr@canb.auug.org.au>

Em 28-09-2010 22:29, Stephen Rothwell escreveu:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/video/bt8xx/bttv-input.c: In function 'init_bttv_i2c_ir':
> drivers/media/video/bt8xx/bttv-input.c:306: error: too few arguments to function 'i2c_new_probed_device'
> 
> Caused by commit 3c81f945a74224d6e3017596297ee9903929b1a7 ("V4L/DVB:
> bttv: Move PV951 IR to the right driver") interacting with commit
> 9a94241afcc9a481691a9c29b7460217925b59b8 ("i2c: Add support for custom
> probe function") that entered Linus' tree in v2.6.36-rc1.  I guess that
> the v4l-dvb commit moved that code to a driver that is now being built.
> 
> I have used the v4l-dvb tree from next-20100928 for today.

Thanks. It is probably a badly handled merge conflict. I had to manually merge
bttv-i2c and cx88-i2c from two different trees locally.

I'll work on it and re-merge for the tomorrow's build.

Thanks,
Mauro

  reply	other threads:[~2010-09-29  1:40 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-29  1:29 linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell
2010-09-29  1:40 ` Mauro Carvalho Chehab [this message]
2010-09-30  3:44 ` Mauro Carvalho Chehab
  -- strict thread matches above, loose matches on Subject: below --
2021-02-10  1:46 Stephen Rothwell
2020-09-14  6:24 Stephen Rothwell
2020-09-08  2:11 Stephen Rothwell
2020-04-22  0:41 Stephen Rothwell
2020-04-16  8:27 Stephen Rothwell
2020-03-13  2:19 Stephen Rothwell
2020-03-13  6:48 ` Marco Felsch
2020-03-13  7:05   ` Mauro Carvalho Chehab
2020-03-13  7:14     ` Marco Felsch
2020-03-13  7:07 ` Mauro Carvalho Chehab
2020-03-13 10:29   ` Stephen Rothwell
2020-03-16  6:50   ` Mauro Carvalho Chehab
2019-07-23  0:13 Stephen Rothwell
2019-07-23 15:14 ` Ezequiel Garcia
2019-07-23 15:52   ` Mauro Carvalho Chehab
2019-02-18 23:52 Stephen Rothwell
2018-07-27  1:49 Stephen Rothwell
2017-06-21  1:25 Stephen Rothwell
2017-06-21  8:54 ` Stanimir Varbanov
2017-01-31  0:55 Stephen Rothwell
2017-02-02 22:24 ` Stephen Rothwell
2017-02-02 22:46   ` Mauro Carvalho Chehab
2017-02-02 22:59     ` Stephen Rothwell
2017-02-02 23:24       ` Mauro Carvalho Chehab
2017-02-03  0:01         ` Stephen Rothwell
2017-02-03  0:24           ` Mauro Carvalho Chehab
2017-02-05 22:19             ` Stephen Rothwell
2017-02-05 22:22               ` Mauro Carvalho Chehab
2016-09-12  5:10 Stephen Rothwell
2016-09-12  6:33 ` Hans Verkuil
2015-08-12  3:24 Stephen Rothwell
2015-06-19  4:47 Michael Ellerman
2015-04-10 10:11 Stephen Rothwell
2015-04-10 12:45 ` Laurent Pinchart
2015-04-10 12:57   ` Stephen Rothwell
2015-04-13  3:05   ` Stephen Rothwell
2015-04-13  8:02     ` Laurent Pinchart
2014-09-09  2:43 Stephen Rothwell
2014-09-09  3:05 ` Mauro Carvalho Chehab
2014-09-17  3:47 ` Stephen Rothwell
2014-07-25  2:23 Stephen Rothwell
     [not found] ` <9f4bd671-cbe0-4e11-997e-e369c52589f9@email.android.com>
2014-07-25 21:50   ` Mauro Carvalho Chehab
2014-07-15  3:29 Stephen Rothwell
2014-07-15  5:43 ` Guenter Roeck
2014-07-15  5:55   ` Stephen Rothwell
2014-07-15  9:01     ` Guenter Roeck
2014-07-15 18:08     ` Mauro Carvalho Chehab
2014-07-15 19:08       ` Guenter Roeck
2014-07-16  3:04         ` Stephen Rothwell
2014-07-16  4:29           ` Guenter Roeck
2014-07-16 13:21           ` Ingo Molnar
2014-07-16 13:22             ` Stephen Rothwell
2014-07-16 13:24               ` Ingo Molnar
2014-03-31  2:01 Stephen Rothwell
2014-03-31 10:26 ` Mauro Carvalho Chehab
2013-01-11  0:39 Stephen Rothwell
2013-01-11 15:12 ` Mauro Carvalho Chehab
2012-11-26  2:31 Stephen Rothwell
2012-11-26 12:10 ` Mauro Carvalho Chehab
2012-11-26 13:44 ` Marek Szyprowski
2012-11-12  0:09 Stephen Rothwell
2012-11-13 13:14 ` Mauro Carvalho Chehab
2012-11-07  0:05 Stephen Rothwell
2012-11-07  1:12 ` Mauro Carvalho Chehab
2012-10-29  0:14 Stephen Rothwell
2012-10-29  8:09 ` David Härdeman
2012-10-29  8:43   ` Jiri Kosina
2012-10-29  9:52   ` Mauro Carvalho Chehab
2012-11-05  0:34 ` Stephen Rothwell
2012-11-06  1:26   ` Mauro Carvalho Chehab
2012-08-17  1:10 Stephen Rothwell
2012-08-17  1:46 ` Mauro Carvalho Chehab
2012-07-09  1:50 Stephen Rothwell
2012-04-11  2:10 Stephen Rothwell
2012-04-11  7:32 ` Srinivas KANDAGATLA
2012-04-17  3:25 ` Stephen Rothwell
2011-09-26  4:02 Stephen Rothwell
2011-09-22  3:12 Stephen Rothwell
2011-09-22 12:46 ` Mauro Carvalho Chehab
2011-09-22 20:19   ` Greg KH
2011-09-23 14:27     ` Mauro Carvalho Chehab
2011-09-27  0:49       ` Greg KH
2011-07-04  3:08 Stephen Rothwell
2011-07-04  3:04 Stephen Rothwell
2011-07-05 12:43 ` Jonathan Corbet
2011-03-22  1:14 Stephen Rothwell
2011-03-22  7:54 ` Mauro Carvalho Chehab
2011-02-28  1:05 Stephen Rothwell
2011-02-28  7:28 ` Hans Verkuil
2011-03-01 11:21   ` Mauro Carvalho Chehab
2011-03-03  1:37 ` Stephen Rothwell
2010-11-14 23:25 Stephen Rothwell
2010-11-22  0:43 ` Stephen Rothwell
2010-11-22 12:08   ` Mauro Carvalho Chehab
2010-10-01  1:41 Stephen Rothwell
2010-05-20  1:45 Stephen Rothwell
2010-05-20  1:51 ` Mauro Carvalho Chehab
2010-04-12  2:40 Stephen Rothwell
2010-04-28  1:07 ` Stephen Rothwell
2010-05-03  5:01   ` Stephen Rothwell
2010-05-03  7:58     ` Mauro Carvalho Chehab
2010-05-03 10:25       ` Stephen Rothwell
2010-02-05  5:52 Stephen Rothwell
2010-02-05 15:02 ` Mauro Carvalho Chehab

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=4CA298F5.40309@infradead.org \
    --to=mchehab@infradead.org \
    --cc=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).