2013-06-07 06:28:49

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the akpm tree

Hi Andrew,

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

In file included from drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h:49:0,
from drivers/staging/lustre/include/linux/libcfs/libcfs.h:44,
from drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h:45,
from drivers/staging/lustre/include/linux/lnet/lib-lnet.h:44,
from drivers/staging/lustre/lnet/lnet/api-ni.c:38:
drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h: In function 'set_shrinker':
drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h:102:3: error: 'struct shrinker' has no member named 'shrink'
s->shrink = func;
^

Caused by commit a37f14f05f2f ("shrinker: Kill old ->shrink API") from
the akpm tree interacting with the new Lustre client code from the
staging tree.

I have just disabled the Lustre client code again (by reverting commit
ee04fd11f11f ("Revert "Revert "staging/lustre: drop CONFIG_BROKEN
dependency""")) and maybe someone can tell me what I need to do to fix
this when I get back in a week.

--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (1.18 kB)
(No filename) (836.00 B)
Download all attachments

2013-06-07 07:27:19

by Peng Tao

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the akpm tree

On Fri, Jun 7, 2013 at 2:28 PM, Stephen Rothwell <[email protected]> wrote:
> Hi Andrew,
>
> After merging the akpm tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h:49:0,
> from drivers/staging/lustre/include/linux/libcfs/libcfs.h:44,
> from drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h:45,
> from drivers/staging/lustre/include/linux/lnet/lib-lnet.h:44,
> from drivers/staging/lustre/lnet/lnet/api-ni.c:38:
> drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h: In function 'set_shrinker':
> drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h:102:3: error: 'struct shrinker' has no member named 'shrink'
> s->shrink = func;
> ^
>
> Caused by commit a37f14f05f2f ("shrinker: Kill old ->shrink API") from
> the akpm tree interacting with the new Lustre client code from the
> staging tree.
>
> I have just disabled the Lustre client code again (by reverting commit
> ee04fd11f11f ("Revert "Revert "staging/lustre: drop CONFIG_BROKEN
> dependency""")) and maybe someone can tell me what I need to do to fix
> this when I get back in a week.
I have a patchset to fix this but haven't yet sent out because it will
break build in Greg's staging tree. I can send it now but please tell
me to whom I should send the patches? Greg's tree doesn't contain
shrinker change, and mm- tree doesn't have Lustre code.

--
Thanks,
Tao

2013-06-07 07:52:58

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the akpm tree

Hi,

On Fri, 7 Jun 2013 15:26:56 +0800 Peng Tao <[email protected]> wrote:
>
> On Fri, Jun 7, 2013 at 2:28 PM, Stephen Rothwell <[email protected]> wrote:
> >
> > After merging the akpm tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > In file included from drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h:49:0,
> > from drivers/staging/lustre/include/linux/libcfs/libcfs.h:44,
> > from drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h:45,
> > from drivers/staging/lustre/include/linux/lnet/lib-lnet.h:44,
> > from drivers/staging/lustre/lnet/lnet/api-ni.c:38:
> > drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h: In function 'set_shrinker':
> > drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h:102:3: error: 'struct shrinker' has no member named 'shrink'
> > s->shrink = func;
> > ^
> >
> > Caused by commit a37f14f05f2f ("shrinker: Kill old ->shrink API") from
> > the akpm tree interacting with the new Lustre client code from the
> > staging tree.
> >
> > I have just disabled the Lustre client code again (by reverting commit
> > ee04fd11f11f ("Revert "Revert "staging/lustre: drop CONFIG_BROKEN
> > dependency""")) and maybe someone can tell me what I need to do to fix
> > this when I get back in a week.
> I have a patchset to fix this but haven't yet sent out because it will
> break build in Greg's staging tree. I can send it now but please tell
> me to whom I should send the patches? Greg's tree doesn't contain
> shrinker change, and mm- tree doesn't have Lustre code.

The mm- tree now has the lustre code since it it based on most of
linux-next, so send them to Andrew.

It will then be up to Andrew and Greg to make sure that the staging tree
is merged into Linus' tree before Andrew's patch bomb.
--
Cheers,
Stephen Rothwell [email protected]


Attachments:
(No filename) (1.90 kB)
(No filename) (836.00 B)
Download all attachments

2013-06-07 08:12:48

by Peng Tao

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the akpm tree

On Fri, Jun 7, 2013 at 3:52 PM, Stephen Rothwell <[email protected]> wrote:
> Hi,
>
> On Fri, 7 Jun 2013 15:26:56 +0800 Peng Tao <[email protected]> wrote:
>>
>> On Fri, Jun 7, 2013 at 2:28 PM, Stephen Rothwell <[email protected]> wrote:
>> >
>> > After merging the akpm tree, today's linux-next build (x86_64
>> > allmodconfig) failed like this:
>> >
>> > In file included from drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h:49:0,
>> > from drivers/staging/lustre/include/linux/libcfs/libcfs.h:44,
>> > from drivers/staging/lustre/include/linux/lnet/linux/lib-lnet.h:45,
>> > from drivers/staging/lustre/include/linux/lnet/lib-lnet.h:44,
>> > from drivers/staging/lustre/lnet/lnet/api-ni.c:38:
>> > drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h: In function 'set_shrinker':
>> > drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h:102:3: error: 'struct shrinker' has no member named 'shrink'
>> > s->shrink = func;
>> > ^
>> >
>> > Caused by commit a37f14f05f2f ("shrinker: Kill old ->shrink API") from
>> > the akpm tree interacting with the new Lustre client code from the
>> > staging tree.
>> >
>> > I have just disabled the Lustre client code again (by reverting commit
>> > ee04fd11f11f ("Revert "Revert "staging/lustre: drop CONFIG_BROKEN
>> > dependency""")) and maybe someone can tell me what I need to do to fix
>> > this when I get back in a week.
>> I have a patchset to fix this but haven't yet sent out because it will
>> break build in Greg's staging tree. I can send it now but please tell
>> me to whom I should send the patches? Greg's tree doesn't contain
>> shrinker change, and mm- tree doesn't have Lustre code.
>
> The mm- tree now has the lustre code since it it based on most of
> linux-next, so send them to Andrew.
>
> It will then be up to Andrew and Greg to make sure that the staging tree
> is merged into Linus' tree before Andrew's patch bomb.
I see. Thanks. I will send them to Andrew then.

--
Thanks,
Tao