linux-next: build failure after merge of the final tree (akpm treerelated)

[Stephen Rothwell]

Hi Andrew,

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

In file included from include/linux/netdevice.h:54:0,
                 from arch/powerpc/net/bpf_jit_comp.c:14:
include/net/netprio_cgroup.h:34:12: error: 'net_prio_subsys_id' redeclared as different kind of symbol
include/linux/cgroup_subsys.h:71:1: note: previous definition of 'net_prio_subsys_id' was here

And many more similar.

Caused (or exposed) by commit 9222aa56c0ce
("include/net/netprio_cgroup.h: various fixes") from the akpm tree.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature