Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1570227 > unrolled thread

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

Back to article view | Back to linux.kernel

Contents

  linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-31 02:10 +0100
    Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-02 23:30 +0100
      Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-02 23:50 +0100
        Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-03 00:00 +0100
          Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-03 00:30 +0100
            Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-03 01:10 +0100
              Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-03 01:30 +0100
                Re: linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-05 23:20 +0100
                  Re: linux-next: build failure after merge of the v4l-dvb tree Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2017-02-05 23:30 +0100

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

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

[toc] | [next] | [standalone]

#1572771

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

[toc] | [prev] | [next] | [standalone]

#1572782

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

[toc] | [prev] | [next] | [standalone]

#1572787

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

[toc] | [prev] | [next] | [standalone]

#1572803

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

[toc] | [prev] | [next] | [standalone]

#1572820

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

[toc] | [prev] | [next] | [standalone]

#1572827

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

[toc] | [prev] | [next] | [standalone]

#1574292

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

[toc] | [prev] | [next] | [standalone]

#1574293

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web