linux-next: build failure after merge of the v4l-dvb tree

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/media/rkisp1/rkisp1-isp.c: In function 'rkisp1_config_isp':
drivers/staging/media/rkisp1/rkisp1-isp.c:294:14: error: 'struct rkisp1_sensor_async' has no member named 'mbus'
  294 |    if (sensor->mbus.type == V4L2_MBUS_BT656)
      |              ^~

Caused by commit

  4d0b43804c12 ("media: staging: rkisp1: remove mbus field from rkisp1_sensor_async")

I have used the v4l-dvb tree from next-20200421 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: modpost: missing MODULE_LICENSE() in drivers/media/i2c/max9271.o

Caused by commit

  7f03d9fefcc5 ("media: i2c: Kconfig: Make MAX9271 a module")

I have used the v4l-dvb tree from next-20210209 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/media/test-drivers/vidtv/vidtv_psi.c: In function 'vidtv_psi_sdt_serv_get_desc_loop_len':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c:103:9: note: in expansion of macro 'GENMASK'
  103 |  mask = GENMASK(0, 11);
      |         ^~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c: In function 'vidtv_psi_pmt_stream_get_desc_loop_len':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c:118:9: note: in expansion of macro 'GENMASK'
  118 |  mask = GENMASK(0, 9);
      |         ^~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c: In function 'vidtv_psi_pmt_get_desc_loop_len':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c:133:9: note: in expansion of macro 'GENMASK'
  133 |  mask = GENMASK(0, 9);
      |         ^~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c: In function 'vidtv_psi_get_sec_len':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c:148:9: note: in expansion of macro 'GENMASK'
  148 |  mask = GENMASK(0, 11);
      |         ^~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c: In function 'vidtv_psi_get_pat_program_pid':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c:163:9: note: in expansion of macro 'GENMASK'
  163 |  mask = GENMASK(0, 12);
      |         ^~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c: In function 'vidtv_psi_pmt_stream_get_elem_pid':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c:178:9: note: in expansion of macro 'GENMASK'
  178 |  mask = GENMASK(0, 12);
      |         ^~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c: In function 'vidtv_psi_set_sec_len':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_psi.c:209:9: note: in expansion of macro 'GENMASK'
  209 |  mask = GENMASK(13, 15);
      |         ^~~~~~~
make[5]: *** [scripts/Makefile.build:283: drivers/media/test-drivers/vidtv/vidtv_psi.o] Error 1
In file included from include/linux/bits.h:22,
                 from include/linux/ratelimit_types.h:5,
                 from include/linux/printk.h:10,
                 from drivers/media/test-drivers/vidtv/vidtv_pes.c:17:
drivers/media/test-drivers/vidtv/vidtv_pes.c: In function 'vidtv_pes_write_pts_dts':
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_pes.c:94:10: note: in expansion of macro 'GENMASK'
   94 |  mask1 = GENMASK(30, 32);
      |          ^~~~~~~
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_pes.c:95:10: note: in expansion of macro 'GENMASK'
   95 |  mask2 = GENMASK(15, 29);
      |          ^~~~~~~
include/linux/build_bug.h:16:51: error: negative width in bit-field '<anonymous>'
   16 | #define BUILD_BUG_ON_ZERO(e) ((int)(sizeof(struct { int:(-!!(e)); })))
      |                                                   ^
include/linux/bits.h:24:3: note: in expansion of macro 'BUILD_BUG_ON_ZERO'
   24 |  (BUILD_BUG_ON_ZERO(__builtin_choose_expr( \
      |   ^~~~~~~~~~~~~~~~~
include/linux/bits.h:38:3: note: in expansion of macro 'GENMASK_INPUT_CHECK'
   38 |  (GENMASK_INPUT_CHECK(h, l) + __GENMASK(h, l))
      |   ^~~~~~~~~~~~~~~~~~~
drivers/media/test-drivers/vidtv/vidtv_pes.c:96:10: note: in expansion of macro 'GENMASK'
   96 |  mask3 = GENMASK(0, 14);
      |          ^~~~~~~

Caused by commit

  f90cf6079bf6 ("media: vidtv: add a bridge driver")

I have disabled CONFIG_DVB_VIDTV for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/media/test-drivers/vivid/vivid-core.c: In function 'vivid_create_devnodes':
drivers/media/test-drivers/vivid/vivid-core.c:1318:11: warning: unused variable 'i' [-Wunused-variable]
 1318 |  int ret, i;
      |           ^
drivers/media/test-drivers/vivid/vivid-core.c: In function 'vivid_create_instance':
drivers/media/test-drivers/vivid/vivid-core.c:1885:47: error: 'cec_tx_bus_cnt' undeclared (first use in this function)
 1885 |  ret = vivid_create_devnodes(pdev, dev, inst, cec_tx_bus_cnt,
      |                                               ^~~~~~~~~~~~~~
drivers/media/test-drivers/vivid/vivid-core.c:1885:47: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  62c6b4c9e3c8 ("media: vivid: move the devnode creation logic to a separate function")

I have used the v4l-dvb tree from next-20200903 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (s390 defconfig
and other s390 configs) failed like this:

drivers/pci/Kconfig:16:error: recursive dependency detected!
drivers/pci/Kconfig:16:	symbol PCI is selected by CEC_SECO
drivers/media/cec/platform/Kconfig:100:	symbol CEC_SECO depends on MEDIA_CEC_SUPPORT
drivers/media/cec/Kconfig:27:	symbol MEDIA_CEC_SUPPORT default is visible depending on MEDIA_SUPPORT_FILTER
drivers/media/Kconfig:25:	symbol MEDIA_SUPPORT_FILTER depends on MEDIA_SUPPORT
drivers/media/Kconfig:12:	symbol MEDIA_SUPPORT depends on HAS_IOMEM
arch/s390/Kconfig:722:	symbol HAS_IOMEM default value contains PCI
For a resolution refer to Documentation/kbuild/kconfig-language.rst
subsection "Kconfig recursive dependency limitations"

Not really sure which commit caused this.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR: modpost: "fwnode_get_name" [drivers/media/v4l2-core/v4l2-fwnode.ko] undefined!

Caused by commit

  dfc22c073b78 ("media: v4l2-fwnode: add initial connector parsing support")

I have used the v4l-dvb tree from next-20200312 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Marco Felsch]

Hi Stephen,

On 20-03-13 13:19, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the v4l-dvb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR: modpost: "fwnode_get_name" [drivers/media/v4l2-core/v4l2-fwnode.ko] undefined!
> 
> Caused by commit
> 
>   dfc22c073b78 ("media: v4l2-fwnode: add initial connector parsing support")
> 
> I have used the v4l-dvb tree from next-20200312 for today.

I'm sorry for that. I put my branch on our 0day to test most of the
compile configs. Obviously this casae wasn't covered..

@Sakari
I will send a patch to fix this by adding:
EXPORT_SYMBOL_GPL(fwnode_get_name).

Regards,
  Marco

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Fri, 13 Mar 2020 07:48:07 +0100
Marco Felsch <m.felsch@pengutronix.de> escreveu:

> Hi Stephen,
> 
> On 20-03-13 13:19, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > ERROR: modpost: "fwnode_get_name" [drivers/media/v4l2-core/v4l2-fwnode.ko] undefined!
> > 
> > Caused by commit
> > 
> >   dfc22c073b78 ("media: v4l2-fwnode: add initial connector parsing support")
> > 
> > I have used the v4l-dvb tree from next-20200312 for today.  
> 
> I'm sorry for that. I put my branch on our 0day to test most of the
> compile configs. Obviously this casae wasn't covered..
> 
> @Sakari
> I will send a patch to fix this by adding:
> EXPORT_SYMBOL_GPL(fwnode_get_name).

There is already such patch at next-20200312:

$ git show a7914d1072fb8ddeb2ec87bba1d28812483a3565
commit a7914d1072fb8ddeb2ec87bba1d28812483a3565
Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Date:   Mon Mar 2 16:53:51 2020 +0300

    device property: Export fwnode_get_name()
    
    This makes it possible to take advantage of the function in
    the device drivers.
    
    Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
    Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Link: https://lore.kernel.org/r/20200302135353.56659-8-heikki.krogerus@linux.intel.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 511f6d7acdfe..5f35c0ccf5e0 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -566,6 +566,7 @@ const char *fwnode_get_name(const struct fwnode_handle *fwnode)
 {
        return fwnode_call_ptr_op(fwnode, get_name);
 }
+EXPORT_SYMBOL_GPL(fwnode_get_name);
 
 /**
  * fwnode_get_name_prefix - Return the prefix of node for printing purposes




Thanks,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Marco Felsch]

On 20-03-13 08:05, Mauro Carvalho Chehab wrote:
> Em Fri, 13 Mar 2020 07:48:07 +0100
> Marco Felsch <m.felsch@pengutronix.de> escreveu:
> 
> > Hi Stephen,
> > 
> > On 20-03-13 13:19, Stephen Rothwell wrote:
> > > Hi all,
> > > 
> > > After merging the v4l-dvb tree, today's linux-next build (arm
> > > multi_v7_defconfig) failed like this:
> > > 
> > > ERROR: modpost: "fwnode_get_name" [drivers/media/v4l2-core/v4l2-fwnode.ko] undefined!
> > > 
> > > Caused by commit
> > > 
> > >   dfc22c073b78 ("media: v4l2-fwnode: add initial connector parsing support")
> > > 
> > > I have used the v4l-dvb tree from next-20200312 for today.  
> > 
> > I'm sorry for that. I put my branch on our 0day to test most of the
> > compile configs. Obviously this casae wasn't covered..
> > 
> > @Sakari
> > I will send a patch to fix this by adding:
> > EXPORT_SYMBOL_GPL(fwnode_get_name).
> 
> There is already such patch at next-20200312:

You're right. This answers my question why I got no build errors..

Regards,
  Marco

> $ git show a7914d1072fb8ddeb2ec87bba1d28812483a3565
> commit a7914d1072fb8ddeb2ec87bba1d28812483a3565
> Author: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> Date:   Mon Mar 2 16:53:51 2020 +0300
> 
>     device property: Export fwnode_get_name()
>     
>     This makes it possible to take advantage of the function in
>     the device drivers.
>     
>     Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
>     Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>     Link: https://lore.kernel.org/r/20200302135353.56659-8-heikki.krogerus@linux.intel.com
>     Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> diff --git a/drivers/base/property.c b/drivers/base/property.c
> index 511f6d7acdfe..5f35c0ccf5e0 100644
> --- a/drivers/base/property.c
> +++ b/drivers/base/property.c
> @@ -566,6 +566,7 @@ const char *fwnode_get_name(const struct fwnode_handle *fwnode)
>  {
>         return fwnode_call_ptr_op(fwnode, get_name);
>  }
> +EXPORT_SYMBOL_GPL(fwnode_get_name);
>  
>  /**
>   * fwnode_get_name_prefix - Return the prefix of node for printing purposes
> 
> 
> 
> 
> Thanks,
> Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Fri, 13 Mar 2020 13:19:03 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi all,
> 
> After merging the v4l-dvb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR: modpost: "fwnode_get_name" [drivers/media/v4l2-core/v4l2-fwnode.ko] undefined!
> 
> Caused by commit
> 
>   dfc22c073b78 ("media: v4l2-fwnode: add initial connector parsing support")
> 
> I have used the v4l-dvb tree from next-20200312 for today.
 
Hmm... I double-checked at next-20200312. This function is defined
at linux/property.h header:

	include/linux/property.h:const char *fwnode_get_name(const struct fwnode_handle *fwnode);

Its implementation is at drivers/base/property.c, and this is always
built, according with drivers/base/Makefile:

	obj-y			:= component.o core.o bus.o dd.o syscore.o \
				   driver.o class.o platform.o \
				   cpu.o firmware.o init.o map.o devres.o \
				   attribute_container.o transport_class.o \
				   topology.o container.o property.o cacheinfo.o \
				   devcon.o swnode.o

The v4l2-fwnode.c properly includes include/linux/property.h.

So, at least up to next-20200312, everything looks fine on my eyes.

The header is probably there, as the error happened at link stage.

Maybe there is some merge conflict caused by merging a patch from
some other tree that might have renamed or removed its implementation
after next-20200312, or changed from obj-y target?

Or maybe this changeset got reverted?

	a7914d1072fb ("device property: Export fwnode_get_name()")


Thanks,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

On Fri, 13 Mar 2020 08:07:35 +0100 Mauro Carvalho Chehab <mchehab@kernel.org> wrote:
>
> Em Fri, 13 Mar 2020 13:19:03 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> 
> > After merging the v4l-dvb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > ERROR: modpost: "fwnode_get_name" [drivers/media/v4l2-core/v4l2-fwnode.ko] undefined!
> > 
> > Caused by commit
> > 
> >   dfc22c073b78 ("media: v4l2-fwnode: add initial connector parsing support")
> > 
> > I have used the v4l-dvb tree from next-20200312 for today.  
>  
> Hmm... I double-checked at next-20200312. This function is defined
> at linux/property.h header:
> 
> 	include/linux/property.h:const char *fwnode_get_name(const struct fwnode_handle *fwnode);
> 
> Its implementation is at drivers/base/property.c, and this is always
> built, according with drivers/base/Makefile:
> 
> 	obj-y			:= component.o core.o bus.o dd.o syscore.o \
> 				   driver.o class.o platform.o \
> 				   cpu.o firmware.o init.o map.o devres.o \
> 				   attribute_container.o transport_class.o \
> 				   topology.o container.o property.o cacheinfo.o \
> 				   devcon.o swnode.o
> 
> The v4l2-fwnode.c properly includes include/linux/property.h.
> 
> So, at least up to next-20200312, everything looks fine on my eyes.
> 
> The header is probably there, as the error happened at link stage.
> 
> Maybe there is some merge conflict caused by merging a patch from
> some other tree that might have renamed or removed its implementation
> after next-20200312, or changed from obj-y target?
> 
> Or maybe this changeset got reverted?
> 
> 	a7914d1072fb ("device property: Export fwnode_get_name()")

Unfortunately, that commit is in the usb tree which I merge much later
than the v4l-dvb tree.  You should not develop against linux-next, and
you should test your tree standalone as you do not know in which order
the trees will be merged by Linus (or me).  The solutions here include
cherry-picking the commit into the v4l-dvb tree (since it is such a
simple commit and should not cause any complex conflicts) or merge part
of the usb tree into the v4l-dvb tree (which is possible since Greg
never rebases his tree).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Fri, 13 Mar 2020 08:07:35 +0100
Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:

> Em Fri, 13 Mar 2020 13:19:03 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> 
> > Hi all,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > ERROR: modpost: "fwnode_get_name" [drivers/media/v4l2-core/v4l2-fwnode.ko] undefined!
> > 
> > Caused by commit
> > 
> >   dfc22c073b78 ("media: v4l2-fwnode: add initial connector parsing support")
> > 
> > I have used the v4l-dvb tree from next-20200312 for today.  
>  
> Hmm... I double-checked at next-20200312. This function is defined
> at linux/property.h header:
> 
> 	include/linux/property.h:const char *fwnode_get_name(const struct fwnode_handle *fwnode);

...

> So, at least up to next-20200312, everything looks fine on my eyes.
> 
> The header is probably there, as the error happened at link stage.
> 
> Maybe there is some merge conflict caused by merging a patch from
> some other tree that might have renamed or removed its implementation
> after next-20200312, or changed from obj-y target?
> 
> Or maybe this changeset got reverted?
> 
> 	a7914d1072fb ("device property: Export fwnode_get_name()")

I ended by cherry-picking this patch, applying it today on my tree.

Hopefully, this would avoid build problems and won't cause non-trivial
merge conflicts.

Thanks,
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from <command-line>:
include/media/vp8-ctrls.h:25:2: error: unknown type name '__s8'
  __s8 quant_update[4];
  ^~~~
include/media/vp8-ctrls.h:26:2: error: unknown type name '__s8'
  __s8 lf_update[4];
  ^~~~
include/media/vp8-ctrls.h:27:2: error: unknown type name '__u8'
  __u8 segment_probs[3];
  ^~~~
include/media/vp8-ctrls.h:28:2: error: unknown type name '__u8'
  __u8 padding;
  ^~~~
include/media/vp8-ctrls.h:29:2: error: unknown type name '__u32'
  __u32 flags;
  ^~~~~
include/media/vp8-ctrls.h:36:2: error: unknown type name '__s8'
  __s8 ref_frm_delta[4];
  ^~~~
include/media/vp8-ctrls.h:37:2: error: unknown type name '__s8'
  __s8 mb_mode_delta[4];
  ^~~~
include/media/vp8-ctrls.h:38:2: error: unknown type name '__u8'
  __u8 sharpness_level;
  ^~~~
include/media/vp8-ctrls.h:39:2: error: unknown type name '__u8'
  __u8 level;
  ^~~~
include/media/vp8-ctrls.h:40:2: error: unknown type name '__u16'
  __u16 padding;
  ^~~~~
include/media/vp8-ctrls.h:41:2: error: unknown type name '__u32'
  __u32 flags;
  ^~~~~
include/media/vp8-ctrls.h:45:2: error: unknown type name '__u8'
  __u8 y_ac_qi;
  ^~~~
include/media/vp8-ctrls.h:46:2: error: unknown type name '__s8'
  __s8 y_dc_delta;
  ^~~~
include/media/vp8-ctrls.h:47:2: error: unknown type name '__s8'
  __s8 y2_dc_delta;
  ^~~~
include/media/vp8-ctrls.h:48:2: error: unknown type name '__s8'
  __s8 y2_ac_delta;
  ^~~~
include/media/vp8-ctrls.h:49:2: error: unknown type name '__s8'
  __s8 uv_dc_delta;
  ^~~~
include/media/vp8-ctrls.h:50:2: error: unknown type name '__s8'
  __s8 uv_ac_delta;
  ^~~~
include/media/vp8-ctrls.h:51:2: error: unknown type name '__u16'
  __u16 padding;
  ^~~~~
include/media/vp8-ctrls.h:55:2: error: unknown type name '__u8'
  __u8 coeff_probs[4][8][3][11];
  ^~~~
include/media/vp8-ctrls.h:56:2: error: unknown type name '__u8'
  __u8 y_mode_probs[4];
  ^~~~
include/media/vp8-ctrls.h:57:2: error: unknown type name '__u8'
  __u8 uv_mode_probs[3];
  ^~~~
include/media/vp8-ctrls.h:58:2: error: unknown type name '__u8'
  __u8 mv_probs[2][19];
  ^~~~
include/media/vp8-ctrls.h:59:2: error: unknown type name '__u8'
  __u8 padding[3];
  ^~~~
include/media/vp8-ctrls.h:63:2: error: unknown type name '__u8'
  __u8 range;
  ^~~~
include/media/vp8-ctrls.h:64:2: error: unknown type name '__u8'
  __u8 value;
  ^~~~
include/media/vp8-ctrls.h:65:2: error: unknown type name '__u8'
  __u8 bit_count;
  ^~~~
include/media/vp8-ctrls.h:66:2: error: unknown type name '__u8'
  __u8 padding;
  ^~~~
include/media/vp8-ctrls.h:86:2: error: unknown type name '__u16'
  __u16 width;
  ^~~~~
include/media/vp8-ctrls.h:87:2: error: unknown type name '__u16'
  __u16 height;
  ^~~~~
include/media/vp8-ctrls.h:89:2: error: unknown type name '__u8'
  __u8 horizontal_scale;
  ^~~~
include/media/vp8-ctrls.h:90:2: error: unknown type name '__u8'
  __u8 vertical_scale;
  ^~~~
include/media/vp8-ctrls.h:92:2: error: unknown type name '__u8'
  __u8 version;
  ^~~~
include/media/vp8-ctrls.h:93:2: error: unknown type name '__u8'
  __u8 prob_skip_false;
  ^~~~
include/media/vp8-ctrls.h:94:2: error: unknown type name '__u8'
  __u8 prob_intra;
  ^~~~
include/media/vp8-ctrls.h:95:2: error: unknown type name '__u8'
  __u8 prob_last;
  ^~~~
include/media/vp8-ctrls.h:96:2: error: unknown type name '__u8'
  __u8 prob_gf;
  ^~~~
include/media/vp8-ctrls.h:97:2: error: unknown type name '__u8'
  __u8 num_dct_parts;
  ^~~~
include/media/vp8-ctrls.h:99:2: error: unknown type name '__u32'
  __u32 first_part_size;
  ^~~~~
include/media/vp8-ctrls.h:100:2: error: unknown type name '__u32'
  __u32 first_part_header_bits;
  ^~~~~
include/media/vp8-ctrls.h:101:2: error: unknown type name '__u32'
  __u32 dct_part_sizes[8];
  ^~~~~
include/media/vp8-ctrls.h:103:2: error: unknown type name '__u64'
  __u64 last_frame_ts;
  ^~~~~
include/media/vp8-ctrls.h:104:2: error: unknown type name '__u64'
  __u64 golden_frame_ts;
  ^~~~~
include/media/vp8-ctrls.h:105:2: error: unknown type name '__u64'
  __u64 alt_frame_ts;
  ^~~~~
include/media/vp8-ctrls.h:107:2: error: unknown type name '__u64'
  __u64 flags;
  ^~~~~

Caused by commit

  a57d6acaf352 ("media: uapi: Add VP8 stateless decoder API")

I have added the following fix patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 23 Jul 2019 10:07:40 +1000
Subject: [PATCH] media: uapi: new file needs types.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/media/vp8-ctrls.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/media/vp8-ctrls.h b/include/media/vp8-ctrls.h
index 6cc2eeea4c90..53cba826e482 100644
--- a/include/media/vp8-ctrls.h
+++ b/include/media/vp8-ctrls.h
@@ -11,6 +11,8 @@
 #ifndef _VP8_CTRLS_H_
 #define _VP8_CTRLS_H_
 
+#include <linux/types.h>
+
 #define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F')
 
 #define V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER (V4L2_CID_MPEG_BASE + 2000)
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Ezequiel Garcia]

On Tue, 2019-07-23 at 10:13 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> In file included from <command-line>:
> include/media/vp8-ctrls.h:25:2: error: unknown type name '__s8'
>   __s8 quant_update[4];
>   ^~~~
> include/media/vp8-ctrls.h:26:2: error: unknown type name '__s8'
>   __s8 lf_update[4];
>   ^~~~
> include/media/vp8-ctrls.h:27:2: error: unknown type name '__u8'
>   __u8 segment_probs[3];
>   ^~~~
> include/media/vp8-ctrls.h:28:2: error: unknown type name '__u8'
>   __u8 padding;
>   ^~~~
> include/media/vp8-ctrls.h:29:2: error: unknown type name '__u32'
>   __u32 flags;
>   ^~~~~
> include/media/vp8-ctrls.h:36:2: error: unknown type name '__s8'
>   __s8 ref_frm_delta[4];
>   ^~~~
> include/media/vp8-ctrls.h:37:2: error: unknown type name '__s8'
>   __s8 mb_mode_delta[4];
>   ^~~~
> include/media/vp8-ctrls.h:38:2: error: unknown type name '__u8'
>   __u8 sharpness_level;
>   ^~~~
> include/media/vp8-ctrls.h:39:2: error: unknown type name '__u8'
>   __u8 level;
>   ^~~~
> include/media/vp8-ctrls.h:40:2: error: unknown type name '__u16'
>   __u16 padding;
>   ^~~~~
> include/media/vp8-ctrls.h:41:2: error: unknown type name '__u32'
>   __u32 flags;
>   ^~~~~
> include/media/vp8-ctrls.h:45:2: error: unknown type name '__u8'
>   __u8 y_ac_qi;
>   ^~~~
> include/media/vp8-ctrls.h:46:2: error: unknown type name '__s8'
>   __s8 y_dc_delta;
>   ^~~~
> include/media/vp8-ctrls.h:47:2: error: unknown type name '__s8'
>   __s8 y2_dc_delta;
>   ^~~~
> include/media/vp8-ctrls.h:48:2: error: unknown type name '__s8'
>   __s8 y2_ac_delta;
>   ^~~~
> include/media/vp8-ctrls.h:49:2: error: unknown type name '__s8'
>   __s8 uv_dc_delta;
>   ^~~~
> include/media/vp8-ctrls.h:50:2: error: unknown type name '__s8'
>   __s8 uv_ac_delta;
>   ^~~~
> include/media/vp8-ctrls.h:51:2: error: unknown type name '__u16'
>   __u16 padding;
>   ^~~~~
> include/media/vp8-ctrls.h:55:2: error: unknown type name '__u8'
>   __u8 coeff_probs[4][8][3][11];
>   ^~~~
> include/media/vp8-ctrls.h:56:2: error: unknown type name '__u8'
>   __u8 y_mode_probs[4];
>   ^~~~
> include/media/vp8-ctrls.h:57:2: error: unknown type name '__u8'
>   __u8 uv_mode_probs[3];
>   ^~~~
> include/media/vp8-ctrls.h:58:2: error: unknown type name '__u8'
>   __u8 mv_probs[2][19];
>   ^~~~
> include/media/vp8-ctrls.h:59:2: error: unknown type name '__u8'
>   __u8 padding[3];
>   ^~~~
> include/media/vp8-ctrls.h:63:2: error: unknown type name '__u8'
>   __u8 range;
>   ^~~~
> include/media/vp8-ctrls.h:64:2: error: unknown type name '__u8'
>   __u8 value;
>   ^~~~
> include/media/vp8-ctrls.h:65:2: error: unknown type name '__u8'
>   __u8 bit_count;
>   ^~~~
> include/media/vp8-ctrls.h:66:2: error: unknown type name '__u8'
>   __u8 padding;
>   ^~~~
> include/media/vp8-ctrls.h:86:2: error: unknown type name '__u16'
>   __u16 width;
>   ^~~~~
> include/media/vp8-ctrls.h:87:2: error: unknown type name '__u16'
>   __u16 height;
>   ^~~~~
> include/media/vp8-ctrls.h:89:2: error: unknown type name '__u8'
>   __u8 horizontal_scale;
>   ^~~~
> include/media/vp8-ctrls.h:90:2: error: unknown type name '__u8'
>   __u8 vertical_scale;
>   ^~~~
> include/media/vp8-ctrls.h:92:2: error: unknown type name '__u8'
>   __u8 version;
>   ^~~~
> include/media/vp8-ctrls.h:93:2: error: unknown type name '__u8'
>   __u8 prob_skip_false;
>   ^~~~
> include/media/vp8-ctrls.h:94:2: error: unknown type name '__u8'
>   __u8 prob_intra;
>   ^~~~
> include/media/vp8-ctrls.h:95:2: error: unknown type name '__u8'
>   __u8 prob_last;
>   ^~~~
> include/media/vp8-ctrls.h:96:2: error: unknown type name '__u8'
>   __u8 prob_gf;
>   ^~~~
> include/media/vp8-ctrls.h:97:2: error: unknown type name '__u8'
>   __u8 num_dct_parts;
>   ^~~~
> include/media/vp8-ctrls.h:99:2: error: unknown type name '__u32'
>   __u32 first_part_size;
>   ^~~~~
> include/media/vp8-ctrls.h:100:2: error: unknown type name '__u32'
>   __u32 first_part_header_bits;
>   ^~~~~
> include/media/vp8-ctrls.h:101:2: error: unknown type name '__u32'
>   __u32 dct_part_sizes[8];
>   ^~~~~
> include/media/vp8-ctrls.h:103:2: error: unknown type name '__u64'
>   __u64 last_frame_ts;
>   ^~~~~
> include/media/vp8-ctrls.h:104:2: error: unknown type name '__u64'
>   __u64 golden_frame_ts;
>   ^~~~~
> include/media/vp8-ctrls.h:105:2: error: unknown type name '__u64'
>   __u64 alt_frame_ts;
>   ^~~~~
> include/media/vp8-ctrls.h:107:2: error: unknown type name '__u64'
>   __u64 flags;
>   ^~~~~
> 
> Caused by commit
> 
>   a57d6acaf352 ("media: uapi: Add VP8 stateless decoder API")
> 
> I have added the following fix patch for today.
> 

Looks good, thanks for the fix. I wonder why this
got triggered with VP8 only, and not with MPEG-2.

Acked-by: Ezequiel Garcia <ezequiel@collabora.com>

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 23 Jul 2019 10:07:40 +1000
> Subject: [PATCH] media: uapi: new file needs types.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/media/vp8-ctrls.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/media/vp8-ctrls.h b/include/media/vp8-ctrls.h
> index 6cc2eeea4c90..53cba826e482 100644
> --- a/include/media/vp8-ctrls.h
> +++ b/include/media/vp8-ctrls.h
> @@ -11,6 +11,8 @@
>  #ifndef _VP8_CTRLS_H_
>  #define _VP8_CTRLS_H_
>  
> +#include <linux/types.h>
> +
>  #define V4L2_PIX_FMT_VP8_FRAME v4l2_fourcc('V', 'P', '8', 'F')
>  
>  #define V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER (V4L2_CID_MPEG_BASE + 2000)
> -- 
> 2.20.1
> 

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Tue, 23 Jul 2019 12:14:20 -0300
Ezequiel Garcia <ezequiel@collabora.com> escreveu:

> On Tue, 2019-07-23 at 10:13 +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > In file included from <command-line>:
> > include/media/vp8-ctrls.h:25:2: error: unknown type name '__s8'
> >   __s8 quant_update[4];
> >   ^~~~
> > include/media/vp8-ctrls.h:26:2: error: unknown type name '__s8'
> >   __s8 lf_update[4];
> >   ^~~~
> > include/media/vp8-ctrls.h:27:2: error: unknown type name '__u8'
> >   __u8 segment_probs[3];
> >   ^~~~
> > include/media/vp8-ctrls.h:28:2: error: unknown type name '__u8'
> >   __u8 padding;
> >   ^~~~
> > include/media/vp8-ctrls.h:29:2: error: unknown type name '__u32'
> >   __u32 flags;
> >   ^~~~~
> > include/media/vp8-ctrls.h:36:2: error: unknown type name '__s8'
> >   __s8 ref_frm_delta[4];
> >   ^~~~
> > include/media/vp8-ctrls.h:37:2: error: unknown type name '__s8'
> >   __s8 mb_mode_delta[4];
> >   ^~~~
> > include/media/vp8-ctrls.h:38:2: error: unknown type name '__u8'
> >   __u8 sharpness_level;
> >   ^~~~
> > include/media/vp8-ctrls.h:39:2: error: unknown type name '__u8'
> >   __u8 level;
> >   ^~~~
> > include/media/vp8-ctrls.h:40:2: error: unknown type name '__u16'
> >   __u16 padding;
> >   ^~~~~
> > include/media/vp8-ctrls.h:41:2: error: unknown type name '__u32'
> >   __u32 flags;
> >   ^~~~~
> > include/media/vp8-ctrls.h:45:2: error: unknown type name '__u8'
> >   __u8 y_ac_qi;
> >   ^~~~
> > include/media/vp8-ctrls.h:46:2: error: unknown type name '__s8'
> >   __s8 y_dc_delta;
> >   ^~~~
> > include/media/vp8-ctrls.h:47:2: error: unknown type name '__s8'
> >   __s8 y2_dc_delta;
> >   ^~~~
> > include/media/vp8-ctrls.h:48:2: error: unknown type name '__s8'
> >   __s8 y2_ac_delta;
> >   ^~~~
> > include/media/vp8-ctrls.h:49:2: error: unknown type name '__s8'
> >   __s8 uv_dc_delta;
> >   ^~~~
> > include/media/vp8-ctrls.h:50:2: error: unknown type name '__s8'
> >   __s8 uv_ac_delta;
> >   ^~~~
> > include/media/vp8-ctrls.h:51:2: error: unknown type name '__u16'
> >   __u16 padding;
> >   ^~~~~
> > include/media/vp8-ctrls.h:55:2: error: unknown type name '__u8'
> >   __u8 coeff_probs[4][8][3][11];
> >   ^~~~
> > include/media/vp8-ctrls.h:56:2: error: unknown type name '__u8'
> >   __u8 y_mode_probs[4];
> >   ^~~~
> > include/media/vp8-ctrls.h:57:2: error: unknown type name '__u8'
> >   __u8 uv_mode_probs[3];
> >   ^~~~
> > include/media/vp8-ctrls.h:58:2: error: unknown type name '__u8'
> >   __u8 mv_probs[2][19];
> >   ^~~~
> > include/media/vp8-ctrls.h:59:2: error: unknown type name '__u8'
> >   __u8 padding[3];
> >   ^~~~
> > include/media/vp8-ctrls.h:63:2: error: unknown type name '__u8'
> >   __u8 range;
> >   ^~~~
> > include/media/vp8-ctrls.h:64:2: error: unknown type name '__u8'
> >   __u8 value;
> >   ^~~~
> > include/media/vp8-ctrls.h:65:2: error: unknown type name '__u8'
> >   __u8 bit_count;
> >   ^~~~
> > include/media/vp8-ctrls.h:66:2: error: unknown type name '__u8'
> >   __u8 padding;
> >   ^~~~
> > include/media/vp8-ctrls.h:86:2: error: unknown type name '__u16'
> >   __u16 width;
> >   ^~~~~
> > include/media/vp8-ctrls.h:87:2: error: unknown type name '__u16'
> >   __u16 height;
> >   ^~~~~
> > include/media/vp8-ctrls.h:89:2: error: unknown type name '__u8'
> >   __u8 horizontal_scale;
> >   ^~~~
> > include/media/vp8-ctrls.h:90:2: error: unknown type name '__u8'
> >   __u8 vertical_scale;
> >   ^~~~
> > include/media/vp8-ctrls.h:92:2: error: unknown type name '__u8'
> >   __u8 version;
> >   ^~~~
> > include/media/vp8-ctrls.h:93:2: error: unknown type name '__u8'
> >   __u8 prob_skip_false;
> >   ^~~~
> > include/media/vp8-ctrls.h:94:2: error: unknown type name '__u8'
> >   __u8 prob_intra;
> >   ^~~~
> > include/media/vp8-ctrls.h:95:2: error: unknown type name '__u8'
> >   __u8 prob_last;
> >   ^~~~
> > include/media/vp8-ctrls.h:96:2: error: unknown type name '__u8'
> >   __u8 prob_gf;
> >   ^~~~
> > include/media/vp8-ctrls.h:97:2: error: unknown type name '__u8'
> >   __u8 num_dct_parts;
> >   ^~~~
> > include/media/vp8-ctrls.h:99:2: error: unknown type name '__u32'
> >   __u32 first_part_size;
> >   ^~~~~
> > include/media/vp8-ctrls.h:100:2: error: unknown type name '__u32'
> >   __u32 first_part_header_bits;
> >   ^~~~~
> > include/media/vp8-ctrls.h:101:2: error: unknown type name '__u32'
> >   __u32 dct_part_sizes[8];
> >   ^~~~~
> > include/media/vp8-ctrls.h:103:2: error: unknown type name '__u64'
> >   __u64 last_frame_ts;
> >   ^~~~~
> > include/media/vp8-ctrls.h:104:2: error: unknown type name '__u64'
> >   __u64 golden_frame_ts;
> >   ^~~~~
> > include/media/vp8-ctrls.h:105:2: error: unknown type name '__u64'
> >   __u64 alt_frame_ts;
> >   ^~~~~
> > include/media/vp8-ctrls.h:107:2: error: unknown type name '__u64'
> >   __u64 flags;
> >   ^~~~~
> > 
> > Caused by commit
> > 
> >   a57d6acaf352 ("media: uapi: Add VP8 stateless decoder API")
> > 
> > I have added the following fix patch for today.
> >   
> 
> Looks good, thanks for the fix. I wonder why this
> got triggered with VP8 only, and not with MPEG-2.

I suspect that this got triggered by some change at linux-next, as
it built fine here on the top of 5.3-rc1.

Patch was applied earlier today.

Thanks,
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/media/imx/imx7-media-csi.c: In function 'imx7_csi_set_fmt':
drivers/staging/media/imx/imx7-media-csi.c:1086:11: error: passing argument 2 of 'imx_media_mbus_fmt_to_pix_fmt' from incompatible pointer type [-Werror=incompatible-pointer-types]
           &csi->format_mbus[IMX7_CSI_PAD_SRC],
           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:183:25: note: expected 'struct v4l2_rect *' but argument is of type 'struct v4l2_mbus_framefmt *'
       struct v4l2_rect *compose,
       ~~~~~~~~~~~~~~~~~~^~~~~~~
drivers/staging/media/imx/imx7-media-csi.c:1087:18: error: passing argument 3 of 'imx_media_mbus_fmt_to_pix_fmt' from incompatible pointer type [-Werror=incompatible-pointer-types]
           csi->cc[IMX7_CSI_PAD_SRC]);
           ~~~~~~~^~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:184:40: note: expected 'const struct v4l2_mbus_framefmt *' but argument is of type 'const struct imx_media_pixfmt *'
       const struct v4l2_mbus_framefmt *mbus,
       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
drivers/staging/media/imx/imx7-media-csi.c:1085:2: error: too few arguments to function 'imx_media_mbus_fmt_to_pix_fmt'
  imx_media_mbus_fmt_to_pix_fmt(&vdev_fmt,
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:182:5: note: declared here
 int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/staging/media/imx/imx7-media-csi.c:1089:2: error: too few arguments to function 'imx_media_capture_device_set_format'
  imx_media_capture_device_set_format(vdev, &vdev_fmt);
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/staging/media/imx/imx7-media-csi.c:30:
drivers/staging/media/imx/imx-media.h:278:6: note: declared here
 void imx_media_capture_device_set_format(struct imx_media_video_dev *vdev,
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  05f634040c0d ("media: staging/imx7: add imx7 CSI subdev driver")

interacting with the earlier commit

  5964cbd86922 ("media: imx: Set capture compose rectangle in capture_device_set_format")

I have used the v4l-dvb tree from next-20190218 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/compat_ioctl.c: In function 'do_video_set_spu_palette':
fs/compat_ioctl.c:218:45: error: invalid application of 'sizeof' to incomplete type 'struct video_spu_palette'
  up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
                                             ^~~~~~
In file included from include/linux/uaccess.h:14:0,
                 from include/linux/compat.h:19,
                 from fs/compat_ioctl.c:17:
fs/compat_ioctl.c:219:46: error: dereferencing pointer to incomplete type 'struct video_spu_palette'
  err  = put_user(compat_ptr(palp), &up_native->palette);
                                              ^
At top level:
fs/compat_ioctl.c:206:12: warning: 'do_video_set_spu_palette' defined but not used [-Wunused-function]
 static int do_video_set_spu_palette(struct file *file,
            ^~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  f863ce990030 ("media: dvb: get rid of VIDEO_SET_SPU_PALETTE")

grep is your friend ...

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "qcom_scm_is_available" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!
ERROR: "qcom_scm_pas_shutdown" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!
ERROR: "qcom_scm_set_remote_state" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!

Caused by commits

  af2c3834c8ca ("[media] media: venus: adding core part and helper functions")
  d96d3f30c0f2 ("[media] media: venus: hfi: add Venus HFI files")
  703528005e58 ("[media] media: venus: enable building of Venus video driver")

I have merged the 4vl-dvb tree from next-20170620 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stanimir Varbanov]

Hi Stephen,

On 06/21/2017 04:25 AM, Stephen Rothwell wrote:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "qcom_scm_is_available" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!
> ERROR: "qcom_scm_pas_shutdown" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!
> ERROR: "qcom_scm_set_remote_state" [drivers/media/platform/qcom/venus/venus-core.ko] undefined!
> 
> Caused by commits
> 
>   af2c3834c8ca ("[media] media: venus: adding core part and helper functions")
>   d96d3f30c0f2 ("[media] media: venus: hfi: add Venus HFI files")
>   703528005e58 ("[media] media: venus: enable building of Venus video driver")
> 
> I have merged the 4vl-dvb tree from next-20170620 for today.
> 

I've investigated this and the issue comes from this commit:

d4348b43bbcadb6d5faee36024245944b6600d25 firmware: qcom_scm: Fix to
allow COMPILE_TEST-ing

which is from Andy's qcom git tree, I asked Andy to drop this patch
because it was rejected.

I also manually merged v4l-dvb:master and reverted above commit. After
that allmodconfig builds fine and the subject error from venus driver
disappeared.

Sorry for inconvenience.

-- 
regards,
Stan

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from arch/arm/mach-omap2/pdata-quirks.c:15:0:
arch/arm/mach-omap2/pdata-quirks.c:536:49: error: 'rx51_lirc_data' undeclared here (not in a function)
  OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_lirc_data),
                                                 ^
include/linux/of_platform.h:52:21: note: in definition of macro 'OF_DEV_AUXDATA'
    .platform_data = _pdata }
                     ^

Caused by commit

  a92def1becf3 ("[media] ir-rx51: port to rc-core")

I have used the v4l-dvb tree from next-20170130 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

On Tue, 31 Jan 2017 11:55:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> In file included from arch/arm/mach-omap2/pdata-quirks.c:15:0:
> arch/arm/mach-omap2/pdata-quirks.c:536:49: error: 'rx51_lirc_data' undeclared here (not in a function)
>   OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_lirc_data),
>                                                  ^
> include/linux/of_platform.h:52:21: note: in definition of macro 'OF_DEV_AUXDATA'
>     .platform_data = _pdata }
>                      ^
> 
> Caused by commit
> 
>   a92def1becf3 ("[media] ir-rx51: port to rc-core")
> 
> I have used the v4l-dvb tree from next-20170130 for today.

I am still getting this error.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Fri, 3 Feb 2017 09:24:46 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> On Tue, 31 Jan 2017 11:55:05 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the v4l-dvb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > In file included from arch/arm/mach-omap2/pdata-quirks.c:15:0:
> > arch/arm/mach-omap2/pdata-quirks.c:536:49: error: 'rx51_lirc_data' undeclared here (not in a function)
> >   OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_lirc_data),
> >                                                  ^
> > include/linux/of_platform.h:52:21: note: in definition of macro 'OF_DEV_AUXDATA'
> >     .platform_data = _pdata }
> >                      ^
> > 
> > Caused by commit
> > 
> >   a92def1becf3 ("[media] ir-rx51: port to rc-core")
> > 
> > I have used the v4l-dvb tree from next-20170130 for today.  
> 
> I am still getting this error.

Gah, forgot to push the fix on the -next branch. Should be ok now.

Regards,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

On Thu, 2 Feb 2017 20:46:20 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
>
> Gah, forgot to push the fix on the -next branch. Should be ok now.

What I fetch for the v4l-dvb tree is the master branch of
git://linuxtv.org/mchehab/media-next.git

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Fri, 3 Feb 2017 09:59:34 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> On Thu, 2 Feb 2017 20:46:20 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
> >
> > Gah, forgot to push the fix on the -next branch. Should be ok now.  
> 
> What I fetch for the v4l-dvb tree is the master branch of
> git://linuxtv.org/mchehab/media-next.git

I actually push the patches on a different tree:
	git://linuxtv.org/media_tree.git

At the branches "master" and "fixes", where

master - for rolling develoment patches
fixes - for bug fixes against current -rc release

My current procedure is to manually merge both branches
at git://linuxtv.org/mchehab/media-next.git, but this is a manual
work, that I use to do by the end of the days I merge patches.
Unfortunately, sometimes, I got side-tracked by something and
I forget to do such manual merge.

-- 
Thanks,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

On Thu, 2 Feb 2017 21:24:40 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
>
> I actually push the patches on a different tree:
> 	git://linuxtv.org/media_tree.git
> 
> At the branches "master" and "fixes", where
> 
> master - for rolling develoment patches
> fixes - for bug fixes against current -rc release

So maybe I should fetch those 2 branches separately and save you the
bother of merging them yourself?  There will be occasional conflicts,
but I get those with others trees as well.

> My current procedure is to manually merge both branches
> at git://linuxtv.org/mchehab/media-next.git, but this is a manual
> work, that I use to do by the end of the days I merge patches.
> Unfortunately, sometimes, I got side-tracked by something and
> I forget to do such manual merge.

Unless you need to do that for your own testing.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Fri, 3 Feb 2017 11:01:17 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> On Thu, 2 Feb 2017 21:24:40 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
> >
> > I actually push the patches on a different tree:
> > 	git://linuxtv.org/media_tree.git
> > 
> > At the branches "master" and "fixes", where
> > 
> > master - for rolling develoment patches
> > fixes - for bug fixes against current -rc release  
> 
> So maybe I should fetch those 2 branches separately and save you the
> bother of merging them yourself?  There will be occasional conflicts,
> but I get those with others trees as well.

Yeah, that makes sense.

> 
> > My current procedure is to manually merge both branches
> > at git://linuxtv.org/mchehab/media-next.git, but this is a manual
> > work, that I use to do by the end of the days I merge patches.
> > Unfortunately, sometimes, I got side-tracked by something and
> > I forget to do such manual merge.  
> 
> Unless you need to do that for your own testing.

Yes, when I merge there, I usually run a batch process that takes
about 2 hours on my current build machine[1] and compile it with 57
different config/arch combinations.

[1] I'm waiting for a new machine that will hopefully reduce it.

With Kernel test robot, this usually get good results.

It would be still interesting if you could pull from it, as
sometimes I need to create topic branches (either when there's
a controversial patchset that I would be sending in separate, or
when I need to pull from some other subsystem tree to solve a
complex merge conflict).

So, if this is not a problem to you, maybe you can setup your
environment to pull (in this order) from:

	git://linuxtv.org/media_tree.git fixes
	git://linuxtv.org/media_tree.git master
	git://linuxtv.org/mchehab/media-next.git master

Most of the time, the last pull won't get anything.

-- 
Thanks,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

On Thu, 2 Feb 2017 22:24:35 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
>
> So, if this is not a problem to you, maybe you can setup your
> environment to pull (in this order) from:
> 
> 	git://linuxtv.org/media_tree.git fixes
> 	git://linuxtv.org/media_tree.git master
> 	git://linuxtv.org/mchehab/media-next.git master
> 
> Most of the time, the last pull won't get anything.

OK, from today I have those three trees called v4l-dvb-fixes, v4l-dvb
and v4l-dvb-next respectively.  We'll see how it goes.

Thanks for adding your subsystem tree as a participant of linux-next.  As
you may know, this is not a judgement of your code.  The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window. 

You will need to ensure that the patches/commits in your tree/series have
been:
     * submitted under GPL v2 (or later) and include the Contributor's
        Signed-off-by,
     * posted to the relevant mailing list,
     * reviewed by you (or another maintainer of your subsystem tree),
     * successfully unit tested, and 
     * destined for the current or next Linux merge window.

Basically, this should be just what you would send to Linus (or ask him
to fetch).  It is allowed to be rebased if you deem it necessary.

-- 
Cheers,
Stephen Rothwell 
sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Mon, 6 Feb 2017 09:19:14 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> On Thu, 2 Feb 2017 22:24:35 -0200 Mauro Carvalho Chehab <mchehab@osg.samsung.com> wrote:
> >
> > So, if this is not a problem to you, maybe you can setup your
> > environment to pull (in this order) from:
> > 
> > 	git://linuxtv.org/media_tree.git fixes
> > 	git://linuxtv.org/media_tree.git master
> > 	git://linuxtv.org/mchehab/media-next.git master
> > 
> > Most of the time, the last pull won't get anything.  
> 
> OK, from today I have those three trees called v4l-dvb-fixes, v4l-dvb
> and v4l-dvb-next respectively.  We'll see how it goes.

OK!

Thanks!
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi all,

After merging the dax-misc tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/media/platform/soc_camera/built-in.o:(.opd+0x678): multiple definition of `soc_mbus_config_compatible'
drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x78): first defined here
drivers/media/platform/soc_camera/built-in.o:(.opd+0x630): multiple definition of `soc_mbus_image_size'
drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x30): first defined here
drivers/media/platform/soc_camera/built-in.o:(.opd+0x600): multiple definition of `soc_mbus_samples_per_pixel'
drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x0): first defined here
drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_bytes_per_line':
(.text+0x4d20): multiple definition of `.soc_mbus_bytes_per_line'
drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x120): first defined here
drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_get_fmtdesc':
(.text+0x4f90): multiple definition of `.soc_mbus_get_fmtdesc'
drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x390): first defined here
drivers/media/platform/soc_camera/built-in.o:(.opd+0x660): multiple definition of `soc_mbus_get_fmtdesc'
drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x60): first defined here
drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_image_size':
(.text+0x4e10): multiple definition of `.soc_mbus_image_size'
drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x210): first defined here
drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_samples_per_pixel':
(.text+0x4c00): multiple definition of `.soc_mbus_samples_per_pixel'
drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x0): first defined here
drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_config_compatible':
(.text+0x5030): multiple definition of `.soc_mbus_config_compatible'
drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x430): first defined here
drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_find_fmtdesc':
(.text+0x4ec0): multiple definition of `.soc_mbus_find_fmtdesc'
drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x2c0): first defined here
drivers/media/platform/soc_camera/built-in.o:(.opd+0x648): multiple definition of `soc_mbus_find_fmtdesc'
drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x48): first defined here
drivers/media/platform/soc_camera/built-in.o:(.opd+0x618): multiple definition of `soc_mbus_bytes_per_line'
drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x18): first defined here

Caused by commit

  4bb738f228b3 ("[media] media: platform: pxa_camera: move pxa_camera out of soc_camera")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the v4l-dvb tree

[Hans Verkuil]

On 09/12/2016 07:10 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the dax-misc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/media/platform/soc_camera/built-in.o:(.opd+0x678): multiple definition of `soc_mbus_config_compatible'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x78): first defined here
> drivers/media/platform/soc_camera/built-in.o:(.opd+0x630): multiple definition of `soc_mbus_image_size'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x30): first defined here
> drivers/media/platform/soc_camera/built-in.o:(.opd+0x600): multiple definition of `soc_mbus_samples_per_pixel'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x0): first defined here
> drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_bytes_per_line':
> (.text+0x4d20): multiple definition of `.soc_mbus_bytes_per_line'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x120): first defined here
> drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_get_fmtdesc':
> (.text+0x4f90): multiple definition of `.soc_mbus_get_fmtdesc'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x390): first defined here
> drivers/media/platform/soc_camera/built-in.o:(.opd+0x660): multiple definition of `soc_mbus_get_fmtdesc'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x60): first defined here
> drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_image_size':
> (.text+0x4e10): multiple definition of `.soc_mbus_image_size'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x210): first defined here
> drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_samples_per_pixel':
> (.text+0x4c00): multiple definition of `.soc_mbus_samples_per_pixel'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x0): first defined here
> drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_config_compatible':
> (.text+0x5030): multiple definition of `.soc_mbus_config_compatible'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x430): first defined here
> drivers/media/platform/soc_camera/built-in.o: In function `.soc_mbus_find_fmtdesc':
> (.text+0x4ec0): multiple definition of `.soc_mbus_find_fmtdesc'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.text+0x2c0): first defined here
> drivers/media/platform/soc_camera/built-in.o:(.opd+0x648): multiple definition of `soc_mbus_find_fmtdesc'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x48): first defined here
> drivers/media/platform/soc_camera/built-in.o:(.opd+0x618): multiple definition of `soc_mbus_bytes_per_line'
> drivers/media/platform/soc_camera/soc_mediabus.o:(.opd+0x18): first defined here
>
> Caused by commit
>
>   4bb738f228b3 ("[media] media: platform: pxa_camera: move pxa_camera out of soc_camera")
>
> I have reverted that commit for today.
>

I posted a patch fixing this yesterday. I'll make a pull request today 
for Mauro to merge.

Regards,

	Hans

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR (phandle_references): Reference to non-existent node or label "ssc2"

ERROR: Input tree has errors, aborting (use -f to force output)
scripts/Makefile.lib:293: recipe for target 'arch/arm/boot/dts/stih410-b2120.dtb' failed
ERROR (phandle_references): Reference to non-existent node or label "ssc2"

ERROR: Input tree has errors, aborting (use -f to force output)
scripts/Makefile.lib:293: recipe for target 'arch/arm/boot/dts/stih407-b2120.dtb' failed

Caused by commit

  5d8877b6ae0d ("[media] ARM: DT: STi: STiH407: Add c8sectpfe LinuxDVB DT node")

I have used the v4l-dvb tree from next-20150810 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the v4l-dvb tree

[Michael Ellerman]

Hi all,

After merging the v4l-dvb tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

  drivers/media/platform/sti/bdisp/bdisp-debug.c: In function 'bdisp_dbg_perf':
  drivers/media/platform/sti/bdisp/bdisp-debug.c:600:50: error: expected ';' before ')' token
     min_fps = SECOND / (s32)bdisp->dbg.min_duration);
                                                    ^
  drivers/media/platform/sti/bdisp/bdisp-debug.c:600:50: error: expected statement before ')' token


Caused by commit fdf11845cbc1 "bdisp-debug: don't try to divide by s64":

  @@ -585,16 +587,27 @@ static int bdisp_dbg_perf(struct seq_file *s, void *data)
          }

          avg_time_us = bdisp->dbg.tot_duration;
  -       do_div(avg_time_us, request->nb_req);
  -
  -       avg_fps = 1000000;
  -       min_fps = 1000000;
  -       max_fps = 1000000;
  -       last_fps = 1000000;
  -       do_div(avg_fps, avg_time_us);
  -       do_div(min_fps, bdisp->dbg.min_duration);
  -       do_div(max_fps, bdisp->dbg.max_duration);
  -       do_div(last_fps, bdisp->dbg.last_duration);
  +       div64_s64(avg_time_us, request->nb_req);
  +
  +       if (avg_time_us > SECOND)
  +               avg_fps = 0;
  +       else
  +               avg_fps = SECOND / (s32)avg_time_us;
  +
  +       if (bdisp->dbg.min_duration > SECOND)
  +               min_fps = 0;
  +       else
  +               min_fps = SECOND / (s32)bdisp->dbg.min_duration);
                                                                 ^

I fixed it up for today.

cheers

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error: linux/amba/xilinx_dma.h: No such file or directory
 #include <linux/amba/xilinx_dma.h>
                                   ^

Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video
IP core").

I have reverted that commit (and the 2 following it) for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Laurent Pinchart]

Hi Stephen,

On Friday 10 April 2015 20:11:43 Stephen Rothwell wrote:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error:
> linux/amba/xilinx_dma.h: No such file or directory #include
> <linux/amba/xilinx_dma.h>
>                                    ^
> 
> Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video
> IP core").
> 
> I have reverted that commit (and the 2 following it) for today.

linux/amba/xilinx_dma.h has been moved to linux/dma/xilinx_dma.h by

commit 937abe88aea3161cd3a563e577fc9cf4522c7aad
Author: Kedareswara rao Appana <appana.durga.rao@xilinx.com>
Date:   Mon Mar 2 23:24:24 2015 +0530

    dmaengine: xilinx-dma: move header file to common location
    
    This patch moves the xilinx_dma.h header file
    to the include/linux/dma.
    
    Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
    Signed-off-by: Vinod Koul <vinod.koul@intel.com>

Could you update the path instead of reverting the commits ?

-- 
Regards,

Laurent Pinchart

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Laurent,

On Fri, 10 Apr 2015 15:45:11 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:
>
> On Friday 10 April 2015 20:11:43 Stephen Rothwell wrote:
> > 
> > After merging the v4l-dvb tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error:
> > linux/amba/xilinx_dma.h: No such file or directory #include
> > <linux/amba/xilinx_dma.h>
> >                                    ^
> > 
> > Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video
> > IP core").
> > 
> > I have reverted that commit (and the 2 following it) for today.
> 
> linux/amba/xilinx_dma.h has been moved to linux/dma/xilinx_dma.h by
> 
> commit 937abe88aea3161cd3a563e577fc9cf4522c7aad
> Author: Kedareswara rao Appana <appana.durga.rao@xilinx.com>
> Date:   Mon Mar 2 23:24:24 2015 +0530
> 
>     dmaengine: xilinx-dma: move header file to common location
>     
>     This patch moves the xilinx_dma.h header file
>     to the include/linux/dma.
>     
>     Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
>     Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> 
> Could you update the path instead of reverting the commits ?

Thanks for finding this ... I will do that on Monday.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Laurent,

On Fri, 10 Apr 2015 15:45:11 +0300 Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote:
>
> On Friday 10 April 2015 20:11:43 Stephen Rothwell wrote:
> > Hi Mauro,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> > 
> > drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error:
> > linux/amba/xilinx_dma.h: No such file or directory #include
> > <linux/amba/xilinx_dma.h>
> >                                    ^
> > 
> > Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video
> > IP core").
> > 
> > I have reverted that commit (and the 2 following it) for today.
> 
> linux/amba/xilinx_dma.h has been moved to linux/dma/xilinx_dma.h by
> 
> commit 937abe88aea3161cd3a563e577fc9cf4522c7aad
> Author: Kedareswara rao Appana <appana.durga.rao@xilinx.com>
> Date:   Mon Mar 2 23:24:24 2015 +0530
> 
>     dmaengine: xilinx-dma: move header file to common location
>     
>     This patch moves the xilinx_dma.h header file
>     to the include/linux/dma.
>     
>     Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
>     Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> 
> Could you update the path instead of reverting the commits ?

I applied this:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 13 Apr 2015 12:48:27 +1000
Subject: [PATCH] v4l: xilinx: fix for include file movement

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/platform/xilinx/xilinx-dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index 10209c294168..efde88adf624 100644
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -12,7 +12,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/amba/xilinx_dma.h>
+#include <linux/dma/xilinx_dma.h>
 #include <linux/lcm.h>
 #include <linux/list.h>
 #include <linux/module.h>
-- 
2.1.4


Someone needs to tell Linus when the merge happens.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Laurent Pinchart]

Hi Stephen,

On Monday 13 April 2015 13:05:57 Stephen Rothwell wrote:
> On Fri, 10 Apr 2015 15:45:11 +0300 Laurent Pinchart wrote:
> > On Friday 10 April 2015 20:11:43 Stephen Rothwell wrote:
> > > Hi Mauro,
> > > 
> > > After merging the v4l-dvb tree, today's linux-next build (powerpc
> > > allyesconfig) failed like this:
> > > 
> > > drivers/media/platform/xilinx/xilinx-dma.c:15:35: fatal error:
> > > linux/amba/xilinx_dma.h: No such file or directory #include
> > > <linux/amba/xilinx_dma.h>
> > > 
> > >                                    ^
> > > 
> > > Caused by commit df3305156f98 ("[media] v4l: xilinx: Add Xilinx Video
> > > IP core").
> > > 
> > > I have reverted that commit (and the 2 following it) for today.
> > 
> > linux/amba/xilinx_dma.h has been moved to linux/dma/xilinx_dma.h by
> > 
> > commit 937abe88aea3161cd3a563e577fc9cf4522c7aad
> > Author: Kedareswara rao Appana <appana.durga.rao@xilinx.com>
> > Date:   Mon Mar 2 23:24:24 2015 +0530
> > 
> >     dmaengine: xilinx-dma: move header file to common location
> >     
> >     This patch moves the xilinx_dma.h header file
> >     to the include/linux/dma.
> >     
> >     Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
> >     Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> > 
> > Could you update the path instead of reverting the commits ?
> 
> I applied this:

Perfect, thank you.

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 13 Apr 2015 12:48:27 +1000
> Subject: [PATCH] v4l: xilinx: fix for include file movement
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/platform/xilinx/xilinx-dma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/xilinx/xilinx-dma.c
> b/drivers/media/platform/xilinx/xilinx-dma.c index
> 10209c294168..efde88adf624 100644
> --- a/drivers/media/platform/xilinx/xilinx-dma.c
> +++ b/drivers/media/platform/xilinx/xilinx-dma.c
> @@ -12,7 +12,7 @@
>   * published by the Free Software Foundation.
>   */
> 
> -#include <linux/amba/xilinx_dma.h>
> +#include <linux/dma/xilinx_dma.h>
>  #include <linux/lcm.h>
>  #include <linux/list.h>
>  #include <linux/module.h>

-- 
Regards,

Laurent Pinchart

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

ERROR: "omap_stop_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_start_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_dma_link_lch" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_set_dma_dest_burst_mode" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_set_dma_src_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_request_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_set_dma_transfer_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_set_dma_dest_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "omap_free_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
ERROR: "__bad_ndelay" [drivers/media/platform/s5p-jpeg/s5p-jpeg.ko] undefined!
ERROR: "vpif_lock" [drivers/media/platform/davinci/vpif_display.ko] undefined!
ERROR: "vpif_lock" [drivers/media/platform/davinci/vpif_capture.ko] undefined!

I have used the v4l-dvb tree from next-20140908 for today.

There were also lots of new warnings like:

drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c: In function 's5p_mfc_get_crop_info_h_v6':
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c:2039:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
   (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
   ^

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

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

Hi Stephen,

Em Tue, 9 Sep 2014 12:43:06 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "omap_stop_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_start_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_dma_link_lch" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_dest_burst_mode" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_src_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_request_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_transfer_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_dest_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_free_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "__bad_ndelay" [drivers/media/platform/s5p-jpeg/s5p-jpeg.ko] undefined!
> ERROR: "vpif_lock" [drivers/media/platform/davinci/vpif_display.ko] undefined!
> ERROR: "vpif_lock" [drivers/media/platform/davinci/vpif_capture.ko] undefined!
> 

Yeah, there are several drivers that are now enabled with COMPILE_TEST.

Not sure what's the best thing to do with those errors. Perhaps I should
add some stub functions for those drivers to not complain about linking
issues if COMPILE_TEST.

> I have used the v4l-dvb tree from next-20140908 for today.

> 
> There were also lots of new warnings like:
> 
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c: In function 's5p_mfc_get_crop_info_h_v6':
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c:2039:3: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>    (unsigned int) ctx->dev->mfc_regs->d_display_crop_info1);
>    ^
> 

Those warnings are harmless in practice, but they should be fixed.

I'll be handling them before the next merge window.

Regards,
Mauro

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi all,

On Tue, 9 Sep 2014 12:43:06 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
> 
> ERROR: "omap_stop_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_start_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_dma_link_lch" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_dest_burst_mode" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_src_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_request_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_transfer_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_set_dma_dest_params" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "omap_free_dma" [drivers/media/platform/soc_camera/omap1_camera.ko] undefined!
> ERROR: "__bad_ndelay" [drivers/media/platform/s5p-jpeg/s5p-jpeg.ko] undefined!
> ERROR: "vpif_lock" [drivers/media/platform/davinci/vpif_display.ko] undefined!
> ERROR: "vpif_lock" [drivers/media/platform/davinci/vpif_capture.ko] undefined!

Still getting these ...

> I have used the v4l-dvb tree from next-20140908 for today.

So this still applies.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64 allmodconfig)
failed like this:

drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
drivers/hid/hid-picolcd_cir.c:117:6: error: 'struct rc_dev' has no member named 'allowed_protos'
  rdev->allowed_protos   = RC_BIT_ALL;
      ^

Caused by commit 0dd0e92836cc ("[media] rc-core: remove protocol arrays").

I have used the v4l-dvb tree from next-20410724 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Fri, 25 Jul 2014 07:25:05 +0200
David Härdeman <david@hardeman.nu> escreveu:

> Mauro,
> 
> On July 25, 2014 4:23:17 AM CEST, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >Hi Mauro,
> >
> >After merging the v4l-dvb tree, today's linux-next build (x86_64
> >allmodconfig)
> >failed like this:
> >
> >drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
> >drivers/hid/hid-picolcd_cir.c:117:6: error: 'struct rc_dev' has no
> >member named 'allowed_protos'
> >  rdev->allowed_protos   = RC_BIT_ALL;
> >      ^

Sorry for not noticing. I generally don't do full builds, as doing it
for all archs would require a bigger compilation system than what I
have here. I generally do only partial builds for (almost) all archs
before pushing at linux-next, because it is very hare that a change
on media would break anything outside it.

> I'll have time to look at it on Monday/Tuesday unless you beat me to it.
> 

Well, I can beat you on that ;) it should be allowed_protocols. I'll
fix it here and do a full build to see if you made this mistake on
some other file, as this is the second file where you typed it wrong ;)

Regards,
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc ppc64_defconfig)
failed like this:

arch/powerpc/kernel/smp.c:764:2: error: initialization from incompatible pointer type [-Werror]
  { cpu_smt_mask, powerpc_smt_flags, SD_INIT_NAME(SMT) },
  ^
arch/powerpc/kernel/smp.c:764:2: error: (near initialization for 'powerpc_topology[0].sd_flags') [-Werror]

Caused by commit 6a0b50087a89 ("Merge branch 'patchwork' into
to_next").  The change to include/linux/sched.h in this merge commit
does not seem to appear in either of the parents of the merge.

Its also a change that (when suggested) was shown to cause more
problems than it was worth and dropped.  I can't imagine how it ended
up in the merge commit.

I have used the v4l-dvb tree from next-20140714 for today.  Please fix
this up.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Guenter Roeck]

On 07/14/2014 08:29 PM, Stephen Rothwell wrote:
> Hi Mauro,
>
> After merging the v4l-dvb tree, today's linux-next build (powerpc ppc64_defconfig)
> failed like this:
>
> arch/powerpc/kernel/smp.c:764:2: error: initialization from incompatible pointer type [-Werror]
>    { cpu_smt_mask, powerpc_smt_flags, SD_INIT_NAME(SMT) },
>    ^
> arch/powerpc/kernel/smp.c:764:2: error: (near initialization for 'powerpc_topology[0].sd_flags') [-Werror]
>
> Caused by commit 6a0b50087a89 ("Merge branch 'patchwork' into
> to_next").  The change to include/linux/sched.h in this merge commit
> does not seem to appear in either of the parents of the merge.
>
> Its also a change that (when suggested) was shown to cause more
> problems than it was worth and dropped.  I can't imagine how it ended
> up in the merge commit.
>

Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
a week or so ago.

Guenter

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Guenter,

On Mon, 14 Jul 2014 22:43:42 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
>
> On 07/14/2014 08:29 PM, Stephen Rothwell wrote:
> >
> > After merging the v4l-dvb tree, today's linux-next build (powerpc ppc64_defconfig)
> > failed like this:
> >
> > arch/powerpc/kernel/smp.c:764:2: error: initialization from incompatible pointer type [-Werror]
> >    { cpu_smt_mask, powerpc_smt_flags, SD_INIT_NAME(SMT) },
> >    ^
> > arch/powerpc/kernel/smp.c:764:2: error: (near initialization for 'powerpc_topology[0].sd_flags') [-Werror]
> >
> > Caused by commit 6a0b50087a89 ("Merge branch 'patchwork' into
> > to_next").  The change to include/linux/sched.h in this merge commit
> > does not seem to appear in either of the parents of the merge.
> >
> > Its also a change that (when suggested) was shown to cause more
> > problems than it was worth and dropped.  I can't imagine how it ended
> > up in the merge commit.
> >
> 
> Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
> a week or so ago.

That is in the tip tree and includes the fixups to powerpc and arm.  I
don't merge the tip tree till well after the v4l-dvb tree.  The merge
in the v4l-dvb tree included only the change to include/linus/sched.h
and neither parent fo that merge was based on the tip tree ...

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Guenter Roeck]

On 07/14/2014 10:55 PM, Stephen Rothwell wrote:
> Hi Guenter,
>
> On Mon, 14 Jul 2014 22:43:42 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
>>
>> On 07/14/2014 08:29 PM, Stephen Rothwell wrote:
>>>
>>> After merging the v4l-dvb tree, today's linux-next build (powerpc ppc64_defconfig)
>>> failed like this:
>>>
>>> arch/powerpc/kernel/smp.c:764:2: error: initialization from incompatible pointer type [-Werror]
>>>     { cpu_smt_mask, powerpc_smt_flags, SD_INIT_NAME(SMT) },
>>>     ^
>>> arch/powerpc/kernel/smp.c:764:2: error: (near initialization for 'powerpc_topology[0].sd_flags') [-Werror]
>>>
>>> Caused by commit 6a0b50087a89 ("Merge branch 'patchwork' into
>>> to_next").  The change to include/linux/sched.h in this merge commit
>>> does not seem to appear in either of the parents of the merge.
>>>
>>> Its also a change that (when suggested) was shown to cause more
>>> problems than it was worth and dropped.  I can't imagine how it ended
>>> up in the merge commit.
>>>
>>
>> Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
>> a week or so ago.
>
> That is in the tip tree and includes the fixups to powerpc and arm.  I
> don't merge the tip tree till well after the v4l-dvb tree.  The merge
> in the v4l-dvb tree included only the change to include/linus/sched.h
> and neither parent fo that merge was based on the tip tree ...
>

Ah, looks like that is the older version of my patch. You are right, this version
did have problems.

Thanks,
Guenter

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

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

Hi Guenter,

Em Tue, 15 Jul 2014 15:55:47 +1000
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Guenter,
> 
> On Mon, 14 Jul 2014 22:43:42 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
> >
> > On 07/14/2014 08:29 PM, Stephen Rothwell wrote:
> > >
> > > After merging the v4l-dvb tree, today's linux-next build (powerpc ppc64_defconfig)
> > > failed like this:
> > >
> > > arch/powerpc/kernel/smp.c:764:2: error: initialization from incompatible pointer type [-Werror]
> > >    { cpu_smt_mask, powerpc_smt_flags, SD_INIT_NAME(SMT) },
> > >    ^
> > > arch/powerpc/kernel/smp.c:764:2: error: (near initialization for 'powerpc_topology[0].sd_flags') [-Werror]
> > >
> > > Caused by commit 6a0b50087a89 ("Merge branch 'patchwork' into
> > > to_next").  The change to include/linux/sched.h in this merge commit
> > > does not seem to appear in either of the parents of the merge.
> > >
> > > Its also a change that (when suggested) was shown to cause more
> > > problems than it was worth and dropped.  I can't imagine how it ended
> > > up in the merge commit.
> > >

Sorry, it was merged there by mistake. I had to apply that quick hack
to be able check if everything was ok on my tree before pushing it
upstream (as I do my tests with W=1). Without that hack, it is almost
impossible to see anything at the compilation logs, as it generates
hundreds of warnings like:

In file included from include/linux/i2c.h:31:0,
                 from drivers/staging/media/go7007/go7007-fw.c:31:
include/linux/sched.h:875:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 static inline const int cpu_smt_flags(void)
                         ^
include/linux/sched.h:882:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 static inline const int cpu_core_flags(void)
                         ^
include/linux/sched.h:1002:21: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
 typedef const int (*sched_domain_flags_f)(void);
                     ^

even when compiling just drivers/media and drivers/staging/media.

> > 
> > Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
> > a week or so ago.
> 
> That is in the tip tree and includes the fixups to powerpc and arm.  I
> don't merge the tip tree till well after the v4l-dvb tree.  The merge
> in the v4l-dvb tree included only the change to include/linus/sched.h
> and neither parent fo that merge was based on the tip tree ...
> 
Stephen, 

Do you know if/when this patch will be merged upstream? It doesn't
seem to be at 2.6.16-rc5. Otherwise, I'll likely cherry-pick it on
my trees, as the lack of this fixup is making hard for me to check
if a media tree patch isn't introducing new warnings.

Thanks,
Mauro

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Guenter Roeck]

On Tue, Jul 15, 2014 at 03:08:01PM -0300, Mauro Carvalho Chehab wrote:
> Hi Guenter,
> 
> Em Tue, 15 Jul 2014 15:55:47 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> escreveu:
> 
> > Hi Guenter,
> > 
> > On Mon, 14 Jul 2014 22:43:42 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
> > >
> > > On 07/14/2014 08:29 PM, Stephen Rothwell wrote:
> > > >
> > > > After merging the v4l-dvb tree, today's linux-next build (powerpc ppc64_defconfig)
> > > > failed like this:
> > > >
> > > > arch/powerpc/kernel/smp.c:764:2: error: initialization from incompatible pointer type [-Werror]
> > > >    { cpu_smt_mask, powerpc_smt_flags, SD_INIT_NAME(SMT) },
> > > >    ^
> > > > arch/powerpc/kernel/smp.c:764:2: error: (near initialization for 'powerpc_topology[0].sd_flags') [-Werror]
> > > >
> > > > Caused by commit 6a0b50087a89 ("Merge branch 'patchwork' into
> > > > to_next").  The change to include/linux/sched.h in this merge commit
> > > > does not seem to appear in either of the parents of the merge.
> > > >
> > > > Its also a change that (when suggested) was shown to cause more
> > > > problems than it was worth and dropped.  I can't imagine how it ended
> > > > up in the merge commit.
> > > >
> 
> Sorry, it was merged there by mistake. I had to apply that quick hack
> to be able check if everything was ok on my tree before pushing it
> upstream (as I do my tests with W=1). Without that hack, it is almost
> impossible to see anything at the compilation logs, as it generates
> hundreds of warnings like:
> 
> In file included from include/linux/i2c.h:31:0,
>                  from drivers/staging/media/go7007/go7007-fw.c:31:
> include/linux/sched.h:875:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
>  static inline const int cpu_smt_flags(void)
>                          ^
> include/linux/sched.h:882:25: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
>  static inline const int cpu_core_flags(void)
>                          ^
> include/linux/sched.h:1002:21: warning: type qualifiers ignored on function return type [-Wignored-qualifiers]
>  typedef const int (*sched_domain_flags_f)(void);
>                      ^
> 
> even when compiling just drivers/media and drivers/staging/media.
> 
Yes, I know, I had the same problem with my hwmon and watchdog builds.
I ended up adding code to my test scripts to specifically ignore
those warnings. Of course, that may accidentially remove real warnings,
but it is still better than drowning _all_ warnings in the noise.

> > > 
> > > Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
> > > a week or so ago.
> > 
> > That is in the tip tree and includes the fixups to powerpc and arm.  I
> > don't merge the tip tree till well after the v4l-dvb tree.  The merge
> > in the v4l-dvb tree included only the change to include/linus/sched.h
> > and neither parent fo that merge was based on the tip tree ...
> > 
> Stephen, 
> 
> Do you know if/when this patch will be merged upstream? It doesn't
> seem to be at 2.6.16-rc5. Otherwise, I'll likely cherry-pick it on
	s/2.16/3.16/
> my trees, as the lack of this fixup is making hard for me to check
> if a media tree patch isn't introducing new warnings.
> 

Only queued for 3.17 as far as I can see, and not scheduled for 3.16.

Guenter

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Guenter,

On Tue, 15 Jul 2014 12:08:07 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
>
> > > > Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
> > > > a week or so ago.
> > > 
> > > That is in the tip tree and includes the fixups to powerpc and arm.  I
> > > don't merge the tip tree till well after the v4l-dvb tree.  The merge
> > > in the v4l-dvb tree included only the change to include/linus/sched.h
> > > and neither parent fo that merge was based on the tip tree ...
> > > 
> > Stephen, 
> > 
> > Do you know if/when this patch will be merged upstream? It doesn't
> > seem to be at 2.6.16-rc5. Otherwise, I'll likely cherry-pick it on
> 	s/2.16/3.16/
> > my trees, as the lack of this fixup is making hard for me to check
> > if a media tree patch isn't introducing new warnings.
> 
> Only queued for 3.17 as far as I can see, and not scheduled for 3.16.

Its in the sched/urgent branch of the tip tree, so hopefully it will go
to Linus shortly.

[ccing various tip tree maintainers ...]

Hi guys, this commit (b6220ad66 (sched: Fix compiler warnings)) fixes
lots of W=1 build warnings ... just wondering when it will progress?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Guenter Roeck]

On 07/15/2014 08:04 PM, Stephen Rothwell wrote:
> Hi Guenter,
>
> On Tue, 15 Jul 2014 12:08:07 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
>>
>>>>> Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
>>>>> a week or so ago.
>>>>
>>>> That is in the tip tree and includes the fixups to powerpc and arm.  I
>>>> don't merge the tip tree till well after the v4l-dvb tree.  The merge
>>>> in the v4l-dvb tree included only the change to include/linus/sched.h
>>>> and neither parent fo that merge was based on the tip tree ...
>>>>
>>> Stephen,
>>>
>>> Do you know if/when this patch will be merged upstream? It doesn't
>>> seem to be at 2.6.16-rc5. Otherwise, I'll likely cherry-pick it on
>> 	s/2.16/3.16/
>>> my trees, as the lack of this fixup is making hard for me to check
>>> if a media tree patch isn't introducing new warnings.
>>
>> Only queued for 3.17 as far as I can see, and not scheduled for 3.16.
>
> Its in the sched/urgent branch of the tip tree, so hopefully it will go
> to Linus shortly.
>

Excellent, glad to hear that I was wrong. Looking forward to it.

Thanks,
Guenter

Re: linux-next: build failure after merge of the v4l-dvb tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Guenter,
> 
> On Tue, 15 Jul 2014 12:08:07 -0700 Guenter Roeck <linux@roeck-us.net> wrote:
> >
> > > > > Do you mean b6220ad66 (sched: Fix compiler warnings) ? I thought that was accepted
> > > > > a week or so ago.
> > > > 
> > > > That is in the tip tree and includes the fixups to powerpc and arm.  I
> > > > don't merge the tip tree till well after the v4l-dvb tree.  The merge
> > > > in the v4l-dvb tree included only the change to include/linus/sched.h
> > > > and neither parent fo that merge was based on the tip tree ...
> > > > 
> > > Stephen, 
> > > 
> > > Do you know if/when this patch will be merged upstream? It doesn't
> > > seem to be at 2.6.16-rc5. Otherwise, I'll likely cherry-pick it on
> > 	s/2.16/3.16/
> > > my trees, as the lack of this fixup is making hard for me to check
> > > if a media tree patch isn't introducing new warnings.
> > 
> > Only queued for 3.17 as far as I can see, and not scheduled for 3.16.
> 
> Its in the sched/urgent branch of the tip tree, so hopefully it will go
> to Linus shortly.
> 
> [ccing various tip tree maintainers ...]
> 
> Hi guys, this commit (b6220ad66 (sched: Fix compiler warnings)) fixes
> lots of W=1 build warnings ... just wondering when it will progress?

FYI, I sent the fix to Linus earlier today.

Thanks,

	Ingo

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Ingo,

On Wed, 16 Jul 2014 15:21:14 +0200 Ingo Molnar <mingo@kernel.org> wrote:
>
> FYI, I sent the fix to Linus earlier today.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the v4l-dvb tree

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Ingo,
> 
> On Wed, 16 Jul 2014 15:21:14 +0200 Ingo Molnar <mingo@kernel.org> wrote:
> >
> > FYI, I sent the fix to Linus earlier today.
> 
> Excellent, thanks.

You are welcome!

Thanks,

	Ingo

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/media/usb/em28xx/em28xx-dvb.c: In function 'em28xx_dvb_resume':
drivers/media/usb/em28xx/em28xx-dvb.c:1645:7: error: 'client' undeclared (first use in this function)
   if (client) {
       ^

Caused by commit 37571b163c15 ("[media] em28xx-dvb: fix PCTV 461e tuner
I2C binding").  Basic build testing is a good idea :-(

I have used the v4v-dvb tree from next-20140328 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Hi Stephen,

Em Mon, 31 Mar 2014 13:01:07 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/usb/em28xx/em28xx-dvb.c: In function 'em28xx_dvb_resume':
> drivers/media/usb/em28xx/em28xx-dvb.c:1645:7: error: 'client' undeclared (first use in this function)
>    if (client) {
>        ^
> 
> Caused by commit 37571b163c15 ("[media] em28xx-dvb: fix PCTV 461e tuner
> I2C binding").  Basic build testing is a good idea :-(

Yeah, sorry for that. The affected patch came from another branch,
but one of the hunks got incorrectly merged. I'm applying a fix for
it in a few.

> 
> I have used the v4v-dvb tree from next-20140328 for today.

Thanks!
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/media/platform/sh_veu.c:1146:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_veu_probe'
drivers/media/platform/sh_veu.c:1228:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_veu_remove'
drivers/media/platform/sh_veu.c:1244:2: error: implicit declaration of function '__devexit_p' [-Werror=implicit-function-declaration]
drivers/media/platform/sh_veu.c:1244:25: error: 'sh_veu_remove' undeclared here (not in a function)
drivers/media/platform/sh_veu.c: In function 'sh_veu_init':
drivers/media/platform/sh_veu.c:1253:45: error: 'sh_veu_probe' undeclared (first use in this function)
drivers/media/platform/sh_veu.c:1253:45: note: each undeclared identifier is reported only once for each function it appears in
drivers/media/platform/sh_veu.c: At top level:
drivers/media/platform/sh_veu.c:1095:20: warning: 'sh_veu_bh' defined but not used [-Wunused-function]
drivers/media/platform/sh_veu.c:1109:20: warning: 'sh_veu_isr' defined but not used [-Wunused-function]
drivers/media/platform/sh_veu.c: In function 'sh_veu_init':
drivers/media/platform/sh_veu.c:1254:1: warning: control reaches end of non-void function [-Wreturn-type]

Caused by commit 05efa71bdc0e ("[media] media: add a VEU MEM2MEM format
conversion and scaling driver") interacting with commit 54b956b90360
("Remove __dev* markings from init.h") from the driver-core.current tree.

I have applied the following merge fix patch which could be applied
directly to the v4l-dvb tree (please):

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 11 Jan 2013 11:35:34 +1100
Subject: [PATCH] [media] media: remove __dev* annotations

CONFIG_HOTPLUG is always true now and the __dev* macros have meen removed.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/platform/sh_veu.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
index a018676..cb54c69 100644
--- a/drivers/media/platform/sh_veu.c
+++ b/drivers/media/platform/sh_veu.c
@@ -1143,7 +1143,7 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int __devinit sh_veu_probe(struct platform_device *pdev)
+static int sh_veu_probe(struct platform_device *pdev)
 {
 	struct sh_veu_dev *veu;
 	struct resource *reg_res;
@@ -1225,7 +1225,7 @@ einitctx:
 	return ret;
 }
 
-static int __devexit sh_veu_remove(struct platform_device *pdev)
+static int sh_veu_remove(struct platform_device *pdev)
 {
 	struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
 	struct sh_veu_dev *veu = container_of(v4l2_dev,
@@ -1241,7 +1241,7 @@ static int __devexit sh_veu_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver __refdata sh_veu_pdrv = {
-	.remove		= __devexit_p(sh_veu_remove),
+	.remove		= sh_veu_remove,
 	.driver		= {
 		.name	= "sh_veu",
 		.owner	= THIS_MODULE,
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

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

Em Fri, 11 Jan 2013 11:39:04 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/platform/sh_veu.c:1146:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_veu_probe'
> drivers/media/platform/sh_veu.c:1228:22: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'sh_veu_remove'
> drivers/media/platform/sh_veu.c:1244:2: error: implicit declaration of function '__devexit_p' [-Werror=implicit-function-declaration]
> drivers/media/platform/sh_veu.c:1244:25: error: 'sh_veu_remove' undeclared here (not in a function)
> drivers/media/platform/sh_veu.c: In function 'sh_veu_init':
> drivers/media/platform/sh_veu.c:1253:45: error: 'sh_veu_probe' undeclared (first use in this function)
> drivers/media/platform/sh_veu.c:1253:45: note: each undeclared identifier is reported only once for each function it appears in
> drivers/media/platform/sh_veu.c: At top level:
> drivers/media/platform/sh_veu.c:1095:20: warning: 'sh_veu_bh' defined but not used [-Wunused-function]
> drivers/media/platform/sh_veu.c:1109:20: warning: 'sh_veu_isr' defined but not used [-Wunused-function]
> drivers/media/platform/sh_veu.c: In function 'sh_veu_init':
> drivers/media/platform/sh_veu.c:1254:1: warning: control reaches end of non-void function [-Wreturn-type]
> 
> Caused by commit 05efa71bdc0e ("[media] media: add a VEU MEM2MEM format
> conversion and scaling driver") interacting with commit 54b956b90360
> ("Remove __dev* markings from init.h") from the driver-core.current tree.
> 
> I have applied the following merge fix patch which could be applied
> directly to the v4l-dvb tree (please):

Applied,

Thanks!
Mauro

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 11 Jan 2013 11:35:34 +1100
> Subject: [PATCH] [media] media: remove __dev* annotations
> 
> CONFIG_HOTPLUG is always true now and the __dev* macros have meen removed.
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/platform/sh_veu.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
> index a018676..cb54c69 100644
> --- a/drivers/media/platform/sh_veu.c
> +++ b/drivers/media/platform/sh_veu.c
> @@ -1143,7 +1143,7 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id)
>  	return IRQ_HANDLED;
>  }
>  
> -static int __devinit sh_veu_probe(struct platform_device *pdev)
> +static int sh_veu_probe(struct platform_device *pdev)
>  {
>  	struct sh_veu_dev *veu;
>  	struct resource *reg_res;
> @@ -1225,7 +1225,7 @@ einitctx:
>  	return ret;
>  }
>  
> -static int __devexit sh_veu_remove(struct platform_device *pdev)
> +static int sh_veu_remove(struct platform_device *pdev)
>  {
>  	struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
>  	struct sh_veu_dev *veu = container_of(v4l2_dev,
> @@ -1241,7 +1241,7 @@ static int __devexit sh_veu_remove(struct platform_device *pdev)
>  }
>  
>  static struct platform_driver __refdata sh_veu_pdrv = {
> -	.remove		= __devexit_p(sh_veu_remove),
> +	.remove		= sh_veu_remove,
>  	.driver		= {
>  		.name	= "sh_veu",
>  		.owner	= THIS_MODULE,




Cheers,
Mauro

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "dma_common_get_sgtable" [drivers/media/v4l2-core/videobuf2-dma-contig.ko] undefined!

Caused by commit 9ef2cbeb8192 ("[media] v4l: vb2-dma-contig: add support
for DMABUF exporting").  dma_common_get_sgtable() is called from the
inline dma_get_sgtable_attrs() and dma_get_sgtable_attrs() is "called
from" dma_get_sgtable().  dma_common_get_sgtable() is only defined if
ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY is set which depends on
CONFIG_HAVE_GENERIC_DMA_COHERENT being set which it isn't for this build.

I have used the v4l-dvb tree form next-20121026 for today.

Please try testing your tree with an x86_64 allmodconfig build.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Hi Stephen,

Em Mon, 26 Nov 2012 13:31:53 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "dma_common_get_sgtable" [drivers/media/v4l2-core/videobuf2-dma-contig.ko] undefined!
> 
> Caused by commit 9ef2cbeb8192 ("[media] v4l: vb2-dma-contig: add support
> for DMABUF exporting").  dma_common_get_sgtable() is called from the
> inline dma_get_sgtable_attrs() and dma_get_sgtable_attrs() is "called
> from" dma_get_sgtable().  dma_common_get_sgtable() is only defined if
> ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY is set which depends on
> CONFIG_HAVE_GENERIC_DMA_COHERENT being set which it isn't for this build.
> 
> I have used the v4l-dvb tree form next-20121026 for today.
> 
> Please try testing your tree with an x86_64 allmodconfig build.

My tree does compile here with allmodconfig on x86_64.

A quick fix is to just disable support for DMABUF if !HAVE_GENERIC_DMA_COHERENT.

Regards,
Mauro

-

videobuf2-dma-contig: Only support if  HAVE_GENERIC_DMA_COHERENT

As reported by Stephen:

> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "dma_common_get_sgtable" [drivers/media/v4l2-core/videobuf2-dma-contig.ko] undefined!
>
> Caused by commit 9ef2cbeb8192 ("[media] v4l: vb2-dma-contig: add support
> for DMABUF exporting").  dma_common_get_sgtable() is called from the
> inline dma_get_sgtable_attrs() and dma_get_sgtable_attrs() is "called
> from" dma_get_sgtable().  dma_common_get_sgtable() is only defined if
> ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY is set which depends on
> CONFIG_HAVE_GENERIC_DMA_COHERENT being set which it isn't for this build.

The simplest fix is to just not support DMABUF with vb2-contig, on archs
where this symbol doesn't exist. Some latter patch can rewrite it to
support this outside -arm.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 10beaee..5729450 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -226,6 +226,8 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma)
 /*         DMABUF ops for exporters          */
 /*********************************************/
 
+#ifdef HAVE_GENERIC_DMA_COHERENT
+
 struct vb2_dc_attachment {
 	struct sg_table sgt;
 	enum dma_data_direction dir;
@@ -416,6 +418,8 @@ static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv)
 	return dbuf;
 }
 
+#endif
+
 /*********************************************/
 /*       callbacks for USERPTR buffers       */
 /*********************************************/
@@ -735,7 +739,9 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
 const struct vb2_mem_ops vb2_dma_contig_memops = {
 	.alloc		= vb2_dc_alloc,
 	.put		= vb2_dc_put,
+#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
 	.get_dmabuf	= vb2_dc_get_dmabuf,
+#endif
 	.cookie		= vb2_dc_cookie,
 	.vaddr		= vb2_dc_vaddr,
 	.mmap		= vb2_dc_mmap,

Re: linux-next: build failure after merge of the v4l-dvb tree

[Marek Szyprowski]

Hi Stephen,

On 11/26/2012 3:31 AM, Stephen Rothwell wrote:
> Hi Mauro,
>
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "dma_common_get_sgtable" [drivers/media/v4l2-core/videobuf2-dma-contig.ko] undefined!
>
> Caused by commit 9ef2cbeb8192 ("[media] v4l: vb2-dma-contig: add support
> for DMABUF exporting").  dma_common_get_sgtable() is called from the
> inline dma_get_sgtable_attrs() and dma_get_sgtable_attrs() is "called
> from" dma_get_sgtable().  dma_common_get_sgtable() is only defined if
> ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY is set which depends on
> CONFIG_HAVE_GENERIC_DMA_COHERENT being set which it isn't for this build.
>
> I have used the v4l-dvb tree form next-20121026 for today.
>
> Please try testing your tree with an x86_64 allmodconfig build.

Thanks for spotting this issue. It's my fault, code for 
dma_common_get_sgtable()
function was incorrectly placed under ifdefs in drivrs/base/dma-mapping.

I've posted a fix, please refer to the "dma-mapping: fix 
dma_common_get_sgtable()
conditional compilation" patch, which I will push to Linus asap.

Best regards
-- 
Marek Szyprowski
Samsung Poland R&D Center

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "sms_ir_exit" [drivers/media/common/siano/smsmdtv.ko] undefined!
ERROR: "sms_ir_event" [drivers/media/common/siano/smsmdtv.ko] undefined!
ERROR: "sms_ir_init" [drivers/media/common/siano/smsmdtv.ko] undefined!

This is better than Friday, but still not quite there. :-(

I have used the v4l-dvb tree from next-20121026 again.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Mon, 12 Nov 2012 11:09:35 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "sms_ir_exit" [drivers/media/common/siano/smsmdtv.ko] undefined!
> ERROR: "sms_ir_event" [drivers/media/common/siano/smsmdtv.ko] undefined!
> ERROR: "sms_ir_init" [drivers/media/common/siano/smsmdtv.ko] undefined!
> 
> This is better than Friday, but still not quite there. :-(
> 
> I have used the v4l-dvb tree from next-20121026 again.

Sorry, I did one mistake on my last patch. Instead of adding RC to the
siano core, it was added at the build as if it was an independent module.

The fix is trivial. I'll add it on my tree for tomorrow's merge.

Thanks for pointing it.

Regards,
Mauro

-

[PATCH] [media] siano: fix build with allmodconfig

As reported by Stephen:

	After merging the v4l-dvb tree, today's linux-next build (x86_64
	allmodconfig) failed like this:

	ERROR: "sms_ir_exit" [drivers/media/common/siano/smsmdtv.ko] undefined!
	ERROR: "sms_ir_event" [drivers/media/common/siano/smsmdtv.ko] undefined!
	ERROR: "sms_ir_init" [drivers/media/common/siano/smsmdtv.ko] undefined!

The smsir file should be part of the smsmdtv core, if RC is defined.
Fix it.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/siano/Makefile b/drivers/media/common/siano/Makefile
index 9e7fdf2..81b1e98 100644
--- a/drivers/media/common/siano/Makefile
+++ b/drivers/media/common/siano/Makefile
@@ -3,7 +3,7 @@ smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o
 obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
 
 ifeq ($(CONFIG_SMS_SIANO_RC),y)
-  obj-$(CONFIG_SMS_SIANO_MDTV) += smsir.o
+  smsmdtv-objs += smsir.o
 endif
 
 ccflags-y += -Idrivers/media/dvb-core

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/built-in.o: In function `sms_ir_event':
(.text+0x129b95): undefined reference to `ir_raw_event_store'
drivers/built-in.o: In function `sms_ir_event':
(.text+0x129bb4): undefined reference to `ir_raw_event_handle'
drivers/built-in.o: In function `sms_ir_init':
(.text+0x129bec): undefined reference to `smscore_get_board_id'
drivers/built-in.o: In function `sms_ir_init':
(.text+0x129c17): undefined reference to `rc_allocate_device'
drivers/built-in.o: In function `sms_ir_init':
(.text+0x129cac): undefined reference to `sms_get_board'
drivers/built-in.o: In function `sms_ir_init':
(.text+0x129d41): undefined reference to `sms_get_board'
drivers/built-in.o: In function `sms_ir_init':
(.text+0x129d8c): undefined reference to `rc_register_device'
drivers/built-in.o: In function `sms_ir_init':
(.text+0x129dc3): undefined reference to `rc_free_device'
drivers/built-in.o: In function `sms_ir_exit':
(.text+0x129e15): undefined reference to `rc_unregister_device'

Caused (I think) by commit fdd1eeb49d36 ("[media] siano: allow compiling
it without RC support").  In this build, CONFIG_SMS_SIANO_RC=y and
CONFIG_RC_CORE=m .

I have used the v4l-dvb tree from next-20121026 again today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Wed, 7 Nov 2012 11:05:59 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/built-in.o: In function `sms_ir_event':
> (.text+0x129b95): undefined reference to `ir_raw_event_store'
> drivers/built-in.o: In function `sms_ir_event':
> (.text+0x129bb4): undefined reference to `ir_raw_event_handle'
> drivers/built-in.o: In function `sms_ir_init':
> (.text+0x129bec): undefined reference to `smscore_get_board_id'
> drivers/built-in.o: In function `sms_ir_init':
> (.text+0x129c17): undefined reference to `rc_allocate_device'
> drivers/built-in.o: In function `sms_ir_init':
> (.text+0x129cac): undefined reference to `sms_get_board'
> drivers/built-in.o: In function `sms_ir_init':
> (.text+0x129d41): undefined reference to `sms_get_board'
> drivers/built-in.o: In function `sms_ir_init':
> (.text+0x129d8c): undefined reference to `rc_register_device'
> drivers/built-in.o: In function `sms_ir_init':
> (.text+0x129dc3): undefined reference to `rc_free_device'
> drivers/built-in.o: In function `sms_ir_exit':
> (.text+0x129e15): undefined reference to `rc_unregister_device'
> 
> Caused (I think) by commit fdd1eeb49d36 ("[media] siano: allow compiling
> it without RC support").  In this build, CONFIG_SMS_SIANO_RC=y and
> CONFIG_RC_CORE=m .

Gah, this is one of those things that will require to trick Kconfig.

The thing is that the siano core driver needs to depend on RC_CORE, when
RC is selected. 

While I haven't tested yet, I suspect that the following patch will
likely do the trick.

It has one small drawback: if RC_CORE is a module, the siano driver
can't be builtin, even if siano RC is not selected. 

-

siano: make siano driver a module, when RC_CORE is selected as 'm'

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/common/siano/Kconfig b/drivers/media/common/siano/Kconfig
index 3cb7823..68f0f60 100644
--- a/drivers/media/common/siano/Kconfig
+++ b/drivers/media/common/siano/Kconfig
@@ -5,6 +5,7 @@
 config SMS_SIANO_MDTV
 	tristate
 	depends on DVB_CORE && HAS_DMA
+	depends on !RC_CORE || RC_CORE
 	depends on SMS_USB_DRV || SMS_SDIO_DRV
 	default y
 
diff --git a/drivers/media/common/siano/Makefile b/drivers/media/common/siano/Makefile
index 0e6f5e9..9e7fdf2 100644
--- a/drivers/media/common/siano/Makefile
+++ b/drivers/media/common/siano/Makefile
@@ -1,7 +1,10 @@
 smsmdtv-objs := smscoreapi.o sms-cards.o smsendian.o
 
 obj-$(CONFIG_SMS_SIANO_MDTV) += smsmdtv.o smsdvb.o
-obj-$(CONFIG_SMS_SIANO_RC) += smsir.o
+
+ifeq ($(CONFIG_SMS_SIANO_RC),y)
+  obj-$(CONFIG_SMS_SIANO_MDTV) += smsir.o
+endif
 
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += $(extra-cflags-y) $(extra-cflags-m)
diff --git a/drivers/media/mmc/siano/Kconfig b/drivers/media/mmc/siano/Kconfig
index 69f8061..aa05ad3 100644
--- a/drivers/media/mmc/siano/Kconfig
+++ b/drivers/media/mmc/siano/Kconfig
@@ -4,7 +4,7 @@
 
 config SMS_SDIO_DRV
 	tristate "Siano SMS1xxx based MDTV via SDIO interface"
-	depends on DVB_CORE && RC_CORE && HAS_DMA
+	depends on DVB_CORE && HAS_DMA
 	depends on MMC
 	select MEDIA_COMMON_OPTIONS
 	---help---
diff --git a/drivers/media/usb/siano/Kconfig b/drivers/media/usb/siano/Kconfig
index b2c229e..5afbd9a 100644
--- a/drivers/media/usb/siano/Kconfig
+++ b/drivers/media/usb/siano/Kconfig
@@ -4,7 +4,7 @@
 
 config SMS_USB_DRV
 	tristate "Siano SMS1xxx based MDTV receiver"
-	depends on DVB_CORE && RC_CORE && HAS_DMA
+	depends on DVB_CORE && HAS_DMA
 	select MEDIA_COMMON_OPTIONS
 	---help---
 	  Choose if you would like to have Siano's support for USB interface

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
drivers/hid/hid-picolcd_cir.c:119:27: error: 'RC_TYPE_ALL' undeclared (first use in this function)

Caused by commit c003ab1bedf0 ("[media] rc-core: add separate defines for
protocol bitmaps and numbers").  The new reference was introduced in
commit ae08e324146c ("HID: picoLCD: Add support for CIR") which was
merged by Linus on October 2 into v3.7-rc1 via the hid tree.

I have used the v4l-dvb tree from next-20121026 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[David Härdeman]

On Mon, 29 Oct 2012 11:14:03 +1100, Stephen Rothwell
<sfr@canb.auug.org.au>
wrote:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
> drivers/hid/hid-picolcd_cir.c:119:27: error: 'RC_TYPE_ALL' undeclared
> (first use in this function)

I can fix it, should be easy (rename RC_TYPE_ALL to RC_BIT_ALL).

> Caused by commit c003ab1bedf0 ("[media] rc-core: add separate defines
for
> protocol bitmaps and numbers").  The new reference was introduced in
> commit ae08e324146c ("HID: picoLCD: Add support for CIR") which was
> merged by Linus on October 2 into v3.7-rc1 via the hid tree.
> 
> I have used the v4l-dvb tree from next-20121026 for today.

The question is in which form you want the patch - as a separate patch or
a new version of commit c003ab1bedf0 (i.e. the entire patch)? Also, against
which tree should I create the patch?

Re: linux-next: build failure after merge of the v4l-dvb tree

[Jiri Kosina]

On Mon, 29 Oct 2012, David Härdeman wrote:

> > allmodconfig) failed like this:
> > 
> > drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
> > drivers/hid/hid-picolcd_cir.c:119:27: error: 'RC_TYPE_ALL' undeclared
> > (first use in this function)
> 
> I can fix it, should be easy (rename RC_TYPE_ALL to RC_BIT_ALL).
> 
> > Caused by commit c003ab1bedf0 ("[media] rc-core: add separate defines
> for
> > protocol bitmaps and numbers").  The new reference was introduced in
> > commit ae08e324146c ("HID: picoLCD: Add support for CIR") which was
> > merged by Linus on October 2 into v3.7-rc1 via the hid tree.
> > 
> > I have used the v4l-dvb tree from next-20121026 for today.
> 
> The question is in which form you want the patch - as a separate patch or
> a new version of commit c003ab1bedf0 (i.e. the entire patch)? Also, against
> which tree should I create the patch?

I am not able to see c003ab1bedf0 in repo at

	git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git

so I am not entirely sure what's happening, but I guess that you have just 
changed the define for RC_TYPE_ALL and updated all the drivers under 
drivers/media to use the new name. So please do so for 
drivers/hid/hid-picolcd_cir.c the same way.

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em Mon, 29 Oct 2012 09:09:13 +0100
David Härdeman <david@hardeman.nu> escreveu:

> On Mon, 29 Oct 2012 11:14:03 +1100, Stephen Rothwell
> <sfr@canb.auug.org.au>
> wrote:
> > Hi Mauro,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
> > drivers/hid/hid-picolcd_cir.c:119:27: error: 'RC_TYPE_ALL' undeclared
> > (first use in this function)
> 
> I can fix it, should be easy (rename RC_TYPE_ALL to RC_BIT_ALL).
> 
> > Caused by commit c003ab1bedf0 ("[media] rc-core: add separate defines
> for
> > protocol bitmaps and numbers").  The new reference was introduced in
> > commit ae08e324146c ("HID: picoLCD: Add support for CIR") which was
> > merged by Linus on October 2 into v3.7-rc1 via the hid tree.
> > 
> > I have used the v4l-dvb tree from next-20121026 for today.
> 
> The question is in which form you want the patch - as a separate patch or
> a new version of commit c003ab1bedf0 (i.e. the entire patch)? Also, against
> which tree should I create the patch?

Please do it as a separate patch against linux-media.git. As the original
patch was already merging there, and we don't rebase the tree, there's
not much option.

Regards,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

On Mon, 29 Oct 2012 11:14:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
> drivers/hid/hid-picolcd_cir.c:119:27: error: 'RC_TYPE_ALL' undeclared (first use in this function)
> 
> Caused by commit c003ab1bedf0 ("[media] rc-core: add separate defines for
> protocol bitmaps and numbers").  The new reference was introduced in
> commit ae08e324146c ("HID: picoLCD: Add support for CIR") which was
> merged by Linus on October 2 into v3.7-rc1 via the hid tree.
> 
> I have used the v4l-dvb tree from next-20121026 for today.

I still get this today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Hi Stephen,

Em Mon, 5 Nov 2012 11:34:09 +1100
Stephen Rothwell <sfr@canb.auug.org.au> escreveu:

> Hi Mauro,
> 
> On Mon, 29 Oct 2012 11:14:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the v4l-dvb tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/hid/hid-picolcd_cir.c: In function 'picolcd_init_cir':
> > drivers/hid/hid-picolcd_cir.c:119:27: error: 'RC_TYPE_ALL' undeclared (first use in this function)
> > 
> > Caused by commit c003ab1bedf0 ("[media] rc-core: add separate defines for
> > protocol bitmaps and numbers").  The new reference was introduced in
> > commit ae08e324146c ("HID: picoLCD: Add support for CIR") which was
> > merged by Linus on October 2 into v3.7-rc1 via the hid tree.
> > 
> > I have used the v4l-dvb tree from next-20121026 for today.
> 
> I still get this today.

Not sure what happened, as I think I pushed it on my -next tree. I'm abroad
this week for LinuxCon Europe. Unfortunately, hotel's network blocks almost all
TCP ports, except for web ports. I'm seeing if this can be fixed tomorrow.
If so, I'll be pushing the patches tomorrow night.

Cheers,
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "usb_cypress_load_firmware" [drivers/staging/media/go7007/s2250-loader.ko] undefined!
ERROR: "b2c2_flexcop_debug" [drivers/media/pci/b2c2/b2c2-flexcop-pci.ko] undefined!

Given the major reorganisation going on, I have just used the v4l-dvb
tree from next-20120816 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Hi Stephen,

Em 16-08-2012 22:10, Stephen Rothwell escreveu:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "usb_cypress_load_firmware" [drivers/staging/media/go7007/s2250-loader.ko] undefined!

This is due to the usage of "=" or ":=" instead of "+=" on some places. Just pushed a
patch fixing it.

> ERROR: "b2c2_flexcop_debug" [drivers/media/pci/b2c2/b2c2-flexcop-pci.ko] undefined!

It may also be due to the same reason. I'll double-check this one.

> Given the major reorganisation going on, I have just used the v4l-dvb
> tree from next-20120816 for today.

Ok.

Almost all patches already went there, so I expect that it will be
more stable tomorrow. Yet, it might have some conflicts with a few
trees (like the "trivial" tree).

Regards,
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

usr/include/linux/v4l2-subdev.h:28: included file 'linux/v4l2-common.h' is not exported
usr/include/linux/videodev2.h:63: included file 'linux/v4l2-common.h' is not exported

Introduced by commit 5689b28890f4 ("[media] v4l: Unify selection targets
across V4L2 and V4L2 subdev interfaces").

I have used the v4l-dvb tree from next-20120706 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "__kfifo_max_r" [drivers/media/rc/rc-core.ko] undefined!

Caused by commit 24a19bcbceda ("[media] ir-raw: Check available elements
in kfifo before adding").  kfifo_avail expands to a call to __kfifo_max_r
which is not exported to modules.

I have used the v4l-dvb tree from next-20120410 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Srinivas KANDAGATLA]

I see no reason why __kfifo_max_r should not be exported to modules.
All the __kfifo_* functions in kfifo.h are already exported except this one.
Am happy to generate a patch.

On 11/04/12 03:10, Stephen Rothwell wrote:
> Hi Mauro,
>
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> ERROR: "__kfifo_max_r" [drivers/media/rc/rc-core.ko] undefined!
>
> Caused by commit 24a19bcbceda ("[media] ir-raw: Check available elements
> in kfifo before adding").  kfifo_avail expands to a call to __kfifo_max_r
> which is not exported to modules.
>
> I have used the v4l-dvb tree from next-20120410 for today.

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

On Wed, 11 Apr 2012 12:10:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "__kfifo_max_r" [drivers/media/rc/rc-core.ko] undefined!
> 
> Caused by commit 24a19bcbceda ("[media] ir-raw: Check available elements
> in kfifo before adding").  kfifo_avail expands to a call to __kfifo_max_r
> which is not exported to modules.
> 
> I have used the v4l-dvb tree from next-20120410 for today.

Ping?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "sms_dbg" [drivers/media/dvb/siano/smsusb.ko] undefined!
ERROR: "sms_dbg" [drivers/media/dvb/siano/smsdvb.ko] undefined!

Caused by commit ea3709435c7f ("[media] siano: apply debug flag to module
level").

Relevant config:
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_USB_DRV=m
CONFIG_SMS_SDIO_DRV=m

I have used the veriosn of the v4l-dvb tree from next-20110921 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/dt3155v4l/dt3155v4l.c: In function 'dt3155_start_acq':
drivers/staging/dt3155v4l/dt3155v4l.c:210:2: error: implicit declaration of function 'vb2_dma_contig_plane_paddr'
drivers/staging/dt3155v4l/dt3155v4l.c: At top level:
drivers/staging/dt3155v4l/dt3155v4l.c:321:2: warning: initialization from incompatible pointer type
drivers/staging/dt3155v4l/dt3155v4l.c:325:2: warning: initialization from incompatible pointer type

Casued by commit ba7fcb0c9549 ("[media] media: vb2: dma contig allocator:
use dma_addr instread of paddr").

I have used the v4l-dvb tree from next-20110921 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em 22-09-2011 00:12, Stephen Rothwell escreveu:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/staging/dt3155v4l/dt3155v4l.c: In function 'dt3155_start_acq':
> drivers/staging/dt3155v4l/dt3155v4l.c:210:2: error: implicit declaration of function 'vb2_dma_contig_plane_paddr'
> drivers/staging/dt3155v4l/dt3155v4l.c: At top level:
> drivers/staging/dt3155v4l/dt3155v4l.c:321:2: warning: initialization from incompatible pointer type
> drivers/staging/dt3155v4l/dt3155v4l.c:325:2: warning: initialization from incompatible pointer type
> 
> Casued by commit ba7fcb0c9549 ("[media] media: vb2: dma contig allocator:
> use dma_addr instread of paddr").
> 
> I have used the v4l-dvb tree from next-20110921 for today.

Hi Stephen,

I think that the right thing to do is to disable the building of this
staging driver, if it is not using the current media core API's.

Greg,

If possible, I prefer to merge those staging drivers for the media
subsystem via my tree, as it helps me to solve in advance conflicts
like that. Maybe we could add a drivers/staging/media tree or
drivers/media/staging, and move those beasts to there.

What do you think?

Thanks,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Greg KH]

On Thu, Sep 22, 2011 at 09:46:59AM -0300, Mauro Carvalho Chehab wrote:
> Em 22-09-2011 00:12, Stephen Rothwell escreveu:
> > Hi Mauro,
> > 
> > After merging the v4l-dvb tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/staging/dt3155v4l/dt3155v4l.c: In function 'dt3155_start_acq':
> > drivers/staging/dt3155v4l/dt3155v4l.c:210:2: error: implicit declaration of function 'vb2_dma_contig_plane_paddr'
> > drivers/staging/dt3155v4l/dt3155v4l.c: At top level:
> > drivers/staging/dt3155v4l/dt3155v4l.c:321:2: warning: initialization from incompatible pointer type
> > drivers/staging/dt3155v4l/dt3155v4l.c:325:2: warning: initialization from incompatible pointer type
> > 
> > Casued by commit ba7fcb0c9549 ("[media] media: vb2: dma contig allocator:
> > use dma_addr instread of paddr").
> > 
> > I have used the v4l-dvb tree from next-20110921 for today.
> 
> Hi Stephen,
> 
> I think that the right thing to do is to disable the building of this
> staging driver, if it is not using the current media core API's.
> 
> Greg,
> 
> If possible, I prefer to merge those staging drivers for the media
> subsystem via my tree, as it helps me to solve in advance conflicts
> like that. Maybe we could add a drivers/staging/media tree or
> drivers/media/staging, and move those beasts to there.
> 
> What do you think?

Yes, I would _LOVE_ a drivers/staging/media/ directory so that I know
which drivers I am supposed to be ignoring and leaving to you :)

Just let me know which ones I should move into there and I will do that
today and let you maintain them all and just forward any emails to you.
Which will keep issues like this from happening in the future.

thanks,

greg k-h

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em 22-09-2011 17:19, Greg KH escreveu:
> On Thu, Sep 22, 2011 at 09:46:59AM -0300, Mauro Carvalho Chehab wrote:
>> Em 22-09-2011 00:12, Stephen Rothwell escreveu:
>>> Hi Mauro,
>>>
>>> After merging the v4l-dvb tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>>
>>> drivers/staging/dt3155v4l/dt3155v4l.c: In function 'dt3155_start_acq':
>>> drivers/staging/dt3155v4l/dt3155v4l.c:210:2: error: implicit declaration of function 'vb2_dma_contig_plane_paddr'
>>> drivers/staging/dt3155v4l/dt3155v4l.c: At top level:
>>> drivers/staging/dt3155v4l/dt3155v4l.c:321:2: warning: initialization from incompatible pointer type
>>> drivers/staging/dt3155v4l/dt3155v4l.c:325:2: warning: initialization from incompatible pointer type
>>>
>>> Casued by commit ba7fcb0c9549 ("[media] media: vb2: dma contig allocator:
>>> use dma_addr instread of paddr").
>>>
>>> I have used the v4l-dvb tree from next-20110921 for today.
>>
>> Hi Stephen,
>>
>> I think that the right thing to do is to disable the building of this
>> staging driver, if it is not using the current media core API's.
>>
>> Greg,
>>
>> If possible, I prefer to merge those staging drivers for the media
>> subsystem via my tree, as it helps me to solve in advance conflicts
>> like that. Maybe we could add a drivers/staging/media tree or
>> drivers/media/staging, and move those beasts to there.
>>
>> What do you think?
> 
> Yes, I would _LOVE_ a drivers/staging/media/ directory so that I know
> which drivers I am supposed to be ignoring and leaving to you :)

:)

If you receive any new drivers like the dt3155v4l that include
one of those files:
	linux/videodev2.h
	media/*.h
	linux/dvb/*.h
They're dependent on the media core. So, could you please let me know about
its addition at staging, by either forwarding it to me or adding it at the 
new staging/media c/c me on your reply?

> Just let me know which ones I should move into there and I will do that
> today and let you maintain them all and just forward any emails to you.
> Which will keep issues like this from happening in the future.

At the current linux-next tree, the drivers are media stuff:
	staging/easycap
	staging/go7007
	staging/solo6x10
	staging/cx25821
	staging/lirc
	staging/cxd2099
	staging/altera-stapl
	staging/dt3155v4l

>From the above:
	 staging/tm6000 can be moved to /drivers/media/video, after a final checkpatch
cleanup patch I've made. However, I have some changesets for it on my -next tree,
so it is probably wiser if I move it on my tree instead on yours.

	staging/cx25281 can also be moved to drivers/media/video after some codingstyle
fixups. I think you're received some such patches recently. Not sure if they cover the
remaining checkpatch.pl significative complains.

	staging/cxd2099 has one problem: it exposes a wrong DVB API for the conditional
access module, due to the lack of a proper API definition. It is a driver optionally used 
by some DVB cards, so moving it may require some include fixups. I don't want to move it
out of staging while we don't have a solution for the API issue. I'm planning to discuss 
it during the media KS workshop in Plague.

	staging/altera-stapl can be moved to drivers/misc. One include needs to be fixup
when moving it, as one DVB driver uses it for a couple boards that come with this
companion chipset.

If you prefer, I can do the git mv patches for those weird stuff.

> 
> thanks,
> 
> greg k-h

Thanks,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Greg KH]

On Fri, Sep 23, 2011 at 11:27:02AM -0300, Mauro Carvalho Chehab wrote:
> Em 22-09-2011 17:19, Greg KH escreveu:
> > On Thu, Sep 22, 2011 at 09:46:59AM -0300, Mauro Carvalho Chehab wrote:
> >> Em 22-09-2011 00:12, Stephen Rothwell escreveu:
> >>> Hi Mauro,
> >>>
> >>> After merging the v4l-dvb tree, today's linux-next build (x86_64
> >>> allmodconfig) failed like this:
> >>>
> >>> drivers/staging/dt3155v4l/dt3155v4l.c: In function 'dt3155_start_acq':
> >>> drivers/staging/dt3155v4l/dt3155v4l.c:210:2: error: implicit declaration of function 'vb2_dma_contig_plane_paddr'
> >>> drivers/staging/dt3155v4l/dt3155v4l.c: At top level:
> >>> drivers/staging/dt3155v4l/dt3155v4l.c:321:2: warning: initialization from incompatible pointer type
> >>> drivers/staging/dt3155v4l/dt3155v4l.c:325:2: warning: initialization from incompatible pointer type
> >>>
> >>> Casued by commit ba7fcb0c9549 ("[media] media: vb2: dma contig allocator:
> >>> use dma_addr instread of paddr").
> >>>
> >>> I have used the v4l-dvb tree from next-20110921 for today.
> >>
> >> Hi Stephen,
> >>
> >> I think that the right thing to do is to disable the building of this
> >> staging driver, if it is not using the current media core API's.
> >>
> >> Greg,
> >>
> >> If possible, I prefer to merge those staging drivers for the media
> >> subsystem via my tree, as it helps me to solve in advance conflicts
> >> like that. Maybe we could add a drivers/staging/media tree or
> >> drivers/media/staging, and move those beasts to there.
> >>
> >> What do you think?
> > 
> > Yes, I would _LOVE_ a drivers/staging/media/ directory so that I know
> > which drivers I am supposed to be ignoring and leaving to you :)
> 
> :)
> 
> If you receive any new drivers like the dt3155v4l that include
> one of those files:
> 	linux/videodev2.h
> 	media/*.h
> 	linux/dvb/*.h
> They're dependent on the media core. So, could you please let me know about
> its addition at staging, by either forwarding it to me or adding it at the 
> new staging/media c/c me on your reply?
> 
> > Just let me know which ones I should move into there and I will do that
> > today and let you maintain them all and just forward any emails to you.
> > Which will keep issues like this from happening in the future.
> 
> At the current linux-next tree, the drivers are media stuff:
> 	staging/easycap
> 	staging/go7007
> 	staging/solo6x10
> 	staging/cx25821
> 	staging/lirc
> 	staging/cxd2099
> 	staging/altera-stapl
> 	staging/dt3155v4l
> 
> >From the above:
> 	 staging/tm6000 can be moved to /drivers/media/video, after a final checkpatch
> cleanup patch I've made. However, I have some changesets for it on my -next tree,
> so it is probably wiser if I move it on my tree instead on yours.
> 
> 	staging/cx25281 can also be moved to drivers/media/video after some codingstyle
> fixups. I think you're received some such patches recently. Not sure if they cover the
> remaining checkpatch.pl significative complains.
> 
> 	staging/cxd2099 has one problem: it exposes a wrong DVB API for the conditional
> access module, due to the lack of a proper API definition. It is a driver optionally used 
> by some DVB cards, so moving it may require some include fixups. I don't want to move it
> out of staging while we don't have a solution for the API issue. I'm planning to discuss 
> it during the media KS workshop in Plague.
> 
> 	staging/altera-stapl can be moved to drivers/misc. One include needs to be fixup
> when moving it, as one DVB driver uses it for a couple boards that come with this
> companion chipset.
> 
> If you prefer, I can do the git mv patches for those weird stuff.

That would be easiest, if you want to create drivers/staging/media/ and
move what you want to maintain into it, please do so.

thanks,

greg k-h

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "vb2_dma_contig_init_ctx" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!
ERROR: "vb2_dma_contig_cleanup_ctx" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!
ERROR: "vb2_dma_contig_memops" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!

I have used the v4l-dvb tree from next-20110701 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

ERROR: "vb2_dma_contig_init_ctx" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!
ERROR: "vb2_dma_contig_cleanup_ctx" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!
ERROR: "vb2_dma_contig_memops" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!

I have used the v4l-dvb tree from next-20110701 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Jonathan Corbet]

On Mon, 4 Jul 2011 13:04:42 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> ERROR: "vb2_dma_contig_init_ctx" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!
> ERROR: "vb2_dma_contig_cleanup_ctx" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!
> ERROR: "vb2_dma_contig_memops" [drivers/media/video/marvell-ccic/cafe_ccic.ko] undefined!
> 
> I have used the v4l-dvb tree from next-20110701 for today.

That was my silly mistake, sorry; I messed up the configuration for that
platform.  Hans ran into it first; this patch from him will fix things up
until my next series gets into Mauro's tree.

Sorry,

jon

From: Hans Verkuil <hverkuil@xs4all.nl>
Add a missing selection for cafe_ccic

diff --git a/drivers/media/video/marvell-ccic/Kconfig b/drivers/media/video/marvell-ccic/Kconfig
index 22314a0..68ff5d6 100644
--- a/drivers/media/video/marvell-ccic/Kconfig
+++ b/drivers/media/video/marvell-ccic/Kconfig
@@ -3,6 +3,7 @@ config VIDEO_CAFE_CCIC
 	depends on PCI && I2C && VIDEO_V4L2
 	select VIDEO_OV7670
 	select VIDEOBUF2_VMALLOC
+	select VIDEOBUF2_DMA_CONTIG
 	---help---
 	  This is a video4linux2 driver for the Marvell 88ALP01 integrated
 	  CMOS camera controller.  This is the controller found on first-

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/media/media-devnode.c:40:28: error: linux/smp_lock.h: No such file or directory

Caused by commit cb3c186e31be ("[media] media: Media device node
support").  The BKL is no more ...

Why is a patch with Author date 2009-12-09 turning up in linux-next today?

I have used the v4l-dvb tree from next-20110321 for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em 21-03-2011 22:14, Stephen Rothwell escreveu:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/media-devnode.c:40:28: error: linux/smp_lock.h: No such file or directory

It got removed by this commit: 4ba8216cd90560bc402f52076f64d8546e8aefcb.

There's no reason for the header to be there at media-devnode.c, as it doesn't use
BKL.

> 
> Caused by commit cb3c186e31be ("[media] media: Media device node
> support").  The BKL is no more ...
> 
> Why is a patch with Author date 2009-12-09 turning up in linux-next today?

Because the Media Controller stuff is under development since 2008, but it took a long
time to be mature enough to be merged.

> 
> I have used the v4l-dvb tree from next-20110321 for today.
> 

The fix patch is as simple as the enclosed one. I'm folding it together with the
original changeset (cb3c186e31be), in order to avoid bisect issues.

Thanks!
Mauro

-

commit 1941c46894a60f4c5365fdcce9258f86d3691ae3
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Tue Mar 22 04:43:47 2011 -0300

    [media] media-devnode: Don't include linux/smp_lock.h
    
    drivers/media/media-devnode.c:40:28: error: linux/smp_lock.h: No such file or directory
    
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 5509984..af5263c 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -37,7 +37,6 @@
 #include <linux/kmod.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
-#include <linux/smp_lock.h>
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/uaccess.h>

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl':
drivers/video/matrox/matroxfb_base.c:1155: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function)

Caused by commit 0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l:
removal of old, obsolete ioctls"). grep is your friend ...

I have used the v4l-dvb tree from next-20110225 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Hans Verkuil]

On Monday, February 28, 2011 02:05:01 Stephen Rothwell wrote:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl':
> drivers/video/matrox/matroxfb_base.c:1155: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function)
> 
> Caused by commit 0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l:
> removal of old, obsolete ioctls"). grep is your friend ...
> 
> I have used the v4l-dvb tree from next-20110225 for today.
> 

Mauro,

Here is the trivial fix for this. Must remember next time that matrox borrows
some of the V4L2 API.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

Regards,

	Hans

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index a082deb..4c49fb2 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -1152,7 +1152,6 @@ static int matroxfb_ioctl(struct fb_info *info,
 					return -EFAULT;
 				return err;
 			}
-		case VIDIOC_S_CTRL_OLD:
 		case VIDIOC_S_CTRL:
 			{
 				struct v4l2_control ctrl;

-- 
Hans Verkuil - video4linux developer - sponsored by Cisco

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em 28-02-2011 04:28, Hans Verkuil escreveu:
> On Monday, February 28, 2011 02:05:01 Stephen Rothwell wrote:
>> Hi Mauro,
>>
>> After merging the v4l-dvb tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl':
>> drivers/video/matrox/matroxfb_base.c:1155: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function)
>>
>> Caused by commit 0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l:
>> removal of old, obsolete ioctls"). grep is your friend ...
>>
>> I have used the v4l-dvb tree from next-20110225 for today.
>>
> 
> Mauro,
> 
> Here is the trivial fix for this. Must remember next time that matrox borrows
> some of the V4L2 API.

Yes, patch is trivial, but your patch is incomplete ;) The correct one is attached.
Btw, videodev2.h still have the definitions for VIDIOC_*_OLD. So, I'm preparing a
more complete patch removing the docbook definitions for it.

---

matrox: Remove definition for the legacy VIDIOC_*_OLD ioctls

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index a082deb..8c9dbac 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -101,8 +101,6 @@
 
 #include <linux/version.h>
 
-#define __OLD_VIDIOC_
-
 #include "matroxfb_base.h"
 #include "matroxfb_misc.h"
 #include "matroxfb_accel.h"
@@ -1152,7 +1150,6 @@ static int matroxfb_ioctl(struct fb_info *info,
 					return -EFAULT;
 				return err;
 			}
-		case VIDIOC_S_CTRL_OLD:
 		case VIDIOC_S_CTRL:
 			{
 				struct v4l2_control ctrl;

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

On Mon, 28 Feb 2011 12:05:01 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/video/matrox/matroxfb_base.c: In function 'matroxfb_ioctl':
> drivers/video/matrox/matroxfb_base.c:1155: error: 'VIDIOC_S_CTRL_OLD' undeclared (first use in this function)
> 
> Caused by commit 0ff69fe7cebb65856eba7feb3fd76fb4ba365bf8 ("[media] v4l:
> removal of old, obsolete ioctls"). grep is your friend ...
> 
> I have used the v4l-dvb tree from next-20110225 for today.

I am still getting this ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/media/dvb/dvb-usb/technisat-usb2.c: In function 'technisat_usb2_get_ir':
drivers/media/dvb/dvb-usb/technisat-usb2.c:643: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
drivers/media/dvb/dvb-usb/technisat-usb2.c:649: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
drivers/media/dvb/dvb-usb/technisat-usb2.c:654: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
drivers/media/dvb/dvb-usb/technisat-usb2.c: At top level:
drivers/media/dvb/dvb-usb/technisat-usb2.c:732: error: unknown field 'rc_props' specified in initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: braces around scalar initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: field name not in record or union initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: field name not in record or union initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: excess elements in scalar initializer
drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
make[5]: *** No rule to make target `drivers/media/rc/keymaps/rc-technisat-usb2.c', needed by `drivers/media/rc/keymaps/rc-technisat-usb2.o'.  Stop.

Caused by commit f29235d71ad3995ef9f74ad2f5931eca4ecabdcd ("[media]
technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiver")
interacting with commit 1639cc0c5348957c076c0304005632d4a1b63252
("[media] ir-core: make struct rc_dev the primary interface").

Please make sure your build tests build new/modified files.

I have used the v4l-dvb tree from next-20101112 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

On Mon, 15 Nov 2010 10:25:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/media/dvb/dvb-usb/technisat-usb2.c: In function 'technisat_usb2_get_ir':
> drivers/media/dvb/dvb-usb/technisat-usb2.c:643: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
> drivers/media/dvb/dvb-usb/technisat-usb2.c:649: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
> drivers/media/dvb/dvb-usb/technisat-usb2.c:654: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
> drivers/media/dvb/dvb-usb/technisat-usb2.c: At top level:
> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: error: unknown field 'rc_props' specified in initializer
> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: braces around scalar initializer
> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
> drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: field name not in record or union initializer
> drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: field name not in record or union initializer
> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: excess elements in scalar initializer
> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
> make[5]: *** No rule to make target `drivers/media/rc/keymaps/rc-technisat-usb2.c', needed by `drivers/media/rc/keymaps/rc-technisat-usb2.o'.  Stop.
> 
> Caused by commit f29235d71ad3995ef9f74ad2f5931eca4ecabdcd ("[media]
> technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiver")
> interacting with commit 1639cc0c5348957c076c0304005632d4a1b63252
> ("[media] ir-core: make struct rc_dev the primary interface").
> 
> Please make sure your build tests build new/modified files.
> 
> I have used the v4l-dvb tree from next-20101112 for today.

This is still failing ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Em 21-11-2010 22:43, Stephen Rothwell escreveu:
> Hi Mauro,
> 
> On Mon, 15 Nov 2010 10:25:54 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the v4l-dvb tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/media/dvb/dvb-usb/technisat-usb2.c: In function 'technisat_usb2_get_ir':
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:643: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:649: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:654: error: 'struct dvb_usb_device' has no member named 'rc_input_dev'
>> drivers/media/dvb/dvb-usb/technisat-usb2.c: At top level:
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: error: unknown field 'rc_props' specified in initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: braces around scalar initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:732: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: field name not in record or union initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:733: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: field name not in record or union initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: error: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: excess elements in scalar initializer
>> drivers/media/dvb/dvb-usb/technisat-usb2.c:734: warning: (near initialization for 'technisat_usb2_devices.rc.core.rc_interval')
>> make[5]: *** No rule to make target `drivers/media/rc/keymaps/rc-technisat-usb2.c', needed by `drivers/media/rc/keymaps/rc-technisat-usb2.o'.  Stop.
>>
>> Caused by commit f29235d71ad3995ef9f74ad2f5931eca4ecabdcd ("[media]
>> technisat-usb2: added driver for Technisat's USB2.0 DVB-S/S2 receiver")
>> interacting with commit 1639cc0c5348957c076c0304005632d4a1b63252
>> ("[media] ir-core: make struct rc_dev the primary interface").
>>
>> Please make sure your build tests build new/modified files.
>>
>> I have used the v4l-dvb tree from next-20101112 for today.
> 
> This is still failing ...


Hi Stephen,

It is a simple merge confict between two of my trees that got merged on my linux-next. 
The enclosed patch should fix it. I've already added it to my linux-next tree, so
the conflict should be fixed for tomorrow's build.

Mauro.

>From f80587fdbf8c949d2081aa0e4250d21c09058877 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 22 Nov 2010 10:04:45 -0200
Subject: [PATCH] [media] linux-next: Fix technisat-usb2 compilation

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index bbba149..458fa27 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -246,7 +246,7 @@ static int rc_core_dvb_usb_remote_init(struct dvb_usb_device *d)
 	dev->map_name = d->props.rc.core.rc_codes;
 	dev->change_protocol = d->props.rc.core.change_protocol;
 	dev->allowed_protos = d->props.rc.core.allowed_protos;
-	dev->driver_type = RC_DRIVER_SCANCODE;
+	dev->driver_type = d->props.rc.core.driver_type;
 	usb_to_input_id(d->udev, &dev->input_id);
 	dev->input_name = "IR-receiver inside an USB DVB receiver";
 	dev->input_phys = d->rc_phys;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 83aa982..e818f0c 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -195,6 +195,7 @@ struct dvb_rc {
 	int (*rc_query) (struct dvb_usb_device *d);
 	int rc_interval;
 	bool bulk_mode;				/* uses bulk mode */
+	enum rc_driver_type driver_type;
 };
 
 /**
diff --git a/drivers/media/dvb/dvb-usb/technisat-usb2.c b/drivers/media/dvb/dvb-usb/technisat-usb2.c
index 97a6d45..b0e35e9 100644
--- a/drivers/media/dvb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/dvb/dvb-usb/technisat-usb2.c
@@ -640,18 +640,18 @@ unlock:
 	while (1) {
 		ev.pulse = !ev.pulse;
 		ev.duration = (*b * FIRMWARE_CLOCK_DIVISOR * FIRMWARE_CLOCK_TICK) / 1000;
-		ir_raw_event_store(d->rc_input_dev, &ev);
+		ir_raw_event_store(d->rc_dev, &ev);
 
 		b++;
 		if (*b == 0xff) {
 			ev.pulse = 0;
 			ev.duration = 888888*2;
-			ir_raw_event_store(d->rc_input_dev, &ev);
+			ir_raw_event_store(d->rc_dev, &ev);
 			break;
 		}
 	}
 
-	ir_raw_event_handle(d->rc_input_dev);
+	ir_raw_event_handle(d->rc_dev);
 
 	return 1;
 }
@@ -729,10 +729,8 @@ static struct dvb_usb_device_properties technisat_usb2_devices = {
 		.rc_codes    = RC_MAP_TECHNISAT_USB2,
 		.module_name = "technisat-usb2",
 		.rc_query    = technisat_usb2_rc_query,
-		.rc_props = {
-			.allowed_protos = IR_TYPE_ALL,
-			.driver_type    = RC_DRIVER_IR_RAW,
-		},
+		.allowed_protos = IR_TYPE_ALL,
+		.driver_type    = RC_DRIVER_IR_RAW,
 	}
 };
 
diff --git a/drivers/media/IR/keymaps/rc-technisat-usb2.c b/drivers/media/rc/keymaps/rc-technisat-usb2.c
similarity index 100%
rename from drivers/media/IR/keymaps/rc-technisat-usb2.c
rename to drivers/media/rc/keymaps/rc-technisat-usb2.c

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (x86_64
allmodconfig) failed like this:

usr/include/linux/ivtv.h:26: included file 'linux/videodev2.h' is not exported
usr/include/linux/keyboard.h:4: included file 'linux/wait.h' is not exported
usr/include/linux/matroxfb.h:6: included file 'linux/videodev2.h' is not exported

Presumably caused by a bad merge 770a34e607ff7f5ecc72956a007d01f7f21175bb
("Merge tag 'v2.6.36-rc5' into new") which has mucked up include/linux/Kbuild.

I have used the v4l-dvb tree from next-20100928 again for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

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.

Ok, that's easy. a new parameter were added to this function, probably via Jean's tree.
The fix is as simple as:

-		i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);
+		i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL);

The extra parameter is for an extra customized probe function, that it is not
needed in this case.

I got a small merge problem on this function:

drivers/media/video/wm8739.c

I just merged the conflict resolution at the merge object, and added a new
patch for the extra parameter in order to solve I2C conflict.

I did a compilation test after merging it with next-20100929 and those issues
were solved on my local build.

Cheers,
Mauro.

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/input/evdev.c: In function 'evdev_do_ioctl':
drivers/input/evdev.c:596: error: duplicate case value
drivers/input/evdev.c:574: error: previously used here

Caused by commit ff2956560d97ccdd2c54cb9d0fdd7eb78c113ba9 ("V4L/DVB:
input: Add support for EVIO[CS]GKEYCODEBIG").

Please build test.

I have used the v4l-dvb tree from next-20100519 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Stephen Rothwell wrote:
> Hi Mauro,
> 
> After merging the v4l-dvb tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/input/evdev.c: In function 'evdev_do_ioctl':
> drivers/input/evdev.c:596: error: duplicate case value
> drivers/input/evdev.c:574: error: previously used here
> 
> Caused by commit ff2956560d97ccdd2c54cb9d0fdd7eb78c113ba9 ("V4L/DVB:
> input: Add support for EVIO[CS]GKEYCODEBIG").
> 
> Please build test.
> 
> I have used the v4l-dvb tree from next-20100519 for today.

Yeah, I noticed that. It was due to a bad merge conflict I did. As there's
a bug at the new big getkeycode, I've removed those input changes from
linux-next for a while, since I wanted to send upstream the patches
that I currently have. I've already pushed the new version.

I'll probably add later the input patches, if I can fix the bug today.

-- 

Cheers,
Mauro

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

drivers/input/input.c: In function 'input_default_setkeycode':
drivers/input/input.c:691: error: 'keycode' undeclared (first use in this function)

Caused by commit df7ad46fc171965103f02649f6c2f02c6ca8b331 ("Merge branch
'master' of /home/v4l/bare_trees/v4l-dvb").  The merge resolution is not
quite right.

I have used the v4l-dvb tree from next-20100409 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

On Mon, 12 Apr 2010 12:40:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the v4l-dvb tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> drivers/input/input.c: In function 'input_default_setkeycode':
> drivers/input/input.c:691: error: 'keycode' undeclared (first use in this function)
> 
> Caused by commit df7ad46fc171965103f02649f6c2f02c6ca8b331 ("Merge branch
> 'master' of /home/v4l/bare_trees/v4l-dvb").  The merge resolution is not
> quite right.
> 
> I have used the v4l-dvb tree from next-20100409 for today.

I am still getting this build failure ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

Hi Mauro,

On Wed, 28 Apr 2010 11:07:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 12 Apr 2010 12:40:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the v4l-dvb tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> > 
> > drivers/input/input.c: In function 'input_default_setkeycode':
> > drivers/input/input.c:691: error: 'keycode' undeclared (first use in this function)
> > 
> > Caused by commit df7ad46fc171965103f02649f6c2f02c6ca8b331 ("Merge branch
> > 'master' of /home/v4l/bare_trees/v4l-dvb").  The merge resolution is not
> > quite right.
> > 
> > I have used the v4l-dvb tree from next-20100409 for today.
> 
> I am still getting this build failure ...

Any chance of it being fixed?
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Stephen Rothwell wrote:
> Hi Mauro,
> 
> On Wed, 28 Apr 2010 11:07:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> On Mon, 12 Apr 2010 12:40:41 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>> After merging the v4l-dvb tree, today's linux-next build (powerpc
>>> ppc64_defconfig) failed like this:
>>>
>>> drivers/input/input.c: In function 'input_default_setkeycode':
>>> drivers/input/input.c:691: error: 'keycode' undeclared (first use in this function)
>>>
>>> Caused by commit df7ad46fc171965103f02649f6c2f02c6ca8b331 ("Merge branch
>>> 'master' of /home/v4l/bare_trees/v4l-dvb").  The merge resolution is not
>>> quite right.
>>>
>>> I have used the v4l-dvb tree from next-20100409 for today.
>> I am still getting this build failure ...
> 
> Any chance of it being fixed?

Done. 


-- 

Cheers,
Mauro

Re: linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

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

On Mon, 03 May 2010 04:58:30 -0300 Mauro Carvalho Chehab <mchehab@infradead.org> wrote:
>
> Done. 

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

linux-next: build failure after merge of the v4l-dvb tree

[Stephen Rothwell]

Hi Mauro,

After merging the scsi-post-merge tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_release_buffers':
drivers/media/dvb/ngene/ngene-core.c:1443: error: implicit declaration of function 'vfree'
drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_get_buffers':
drivers/media/dvb/ngene/ngene-core.c:1454: error: implicit declaration of function 'vmalloc'
drivers/media/dvb/ngene/ngene-core.c:1454: warning: assignment makes pointer from integer without a cast
drivers/media/dvb/ngene/ngene-core.c:1461: warning: assignment makes pointer from integer without a cast
drivers/media/dvb/ngene/ngene-core.c:1467: warning: assignment makes pointer from integer without a cast
drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_probe':
drivers/media/dvb/ngene/ngene-core.c:1836: warning: assignment makes pointer from integer without a cast

Caused by commit b54c755d6263efe376f3dfc8c72c8e7b4fb4f4c1 ("V4L/DVB:
ngene: Initial check-in").

I added the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 5 Feb 2010 16:46:47 +1100
Subject: [PATCH] V4L/DVB: using vmalloc requires include linux/vmalloc.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/media/dvb/ngene/ngene-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index ea610e4..cb5982e 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -41,6 +41,7 @@
 #include <linux/version.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
+#include <linux/vmalloc.h>
 
 #include "ngene.h"
 
-- 
1.6.6.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Re: linux-next: build failure after merge of the v4l-dvb tree

[Mauro Carvalho Chehab]

Stephen Rothwell wrote:
> Hi Mauro,
> 
> After merging the scsi-post-merge tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_release_buffers':
> drivers/media/dvb/ngene/ngene-core.c:1443: error: implicit declaration of function 'vfree'
> drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_get_buffers':
> drivers/media/dvb/ngene/ngene-core.c:1454: error: implicit declaration of function 'vmalloc'
> drivers/media/dvb/ngene/ngene-core.c:1454: warning: assignment makes pointer from integer without a cast
> drivers/media/dvb/ngene/ngene-core.c:1461: warning: assignment makes pointer from integer without a cast
> drivers/media/dvb/ngene/ngene-core.c:1467: warning: assignment makes pointer from integer without a cast
> drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_probe':
> drivers/media/dvb/ngene/ngene-core.c:1836: warning: assignment makes pointer from integer without a cast
> 
> Caused by commit b54c755d6263efe376f3dfc8c72c8e7b4fb4f4c1 ("V4L/DVB:
> ngene: Initial check-in").
> 
> I added the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 5 Feb 2010 16:46:47 +1100
> Subject: [PATCH] V4L/DVB: using vmalloc requires include linux/vmalloc.h
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/media/dvb/ngene/ngene-core.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
> index ea610e4..cb5982e 100644
> --- a/drivers/media/dvb/ngene/ngene-core.c
> +++ b/drivers/media/dvb/ngene/ngene-core.c
> @@ -41,6 +41,7 @@
>  #include <linux/version.h>
>  #include <linux/byteorder/generic.h>
>  #include <linux/firmware.h>
> +#include <linux/vmalloc.h>
>  
>  #include "ngene.h"
>  
Thanks for the patch. It looks sane to me. I'm adding it on my linux-next tree.

Cheers,
Mauro.

-- 

Cheers,
Mauro