linux-next: build failure after merge of the akpm tree

[Stephen Rothwell]

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                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature