Hi all,

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

net/bridge/br_multicast.c: In function 'br_multicast_has_querier_adjacent':
net/bridge/br_multicast.c:2248:25: error: 'struct net_bridge' has no member named 'ip6_other_query'
   if (!timer_pending(&br->ip6_other_query.timer) ||
                         ^
In file included from include/linux/idr.h:18:0,
                 from include/linux/kernfs.h:14,
                 from include/linux/sysfs.h:15,
                 from include/linux/kobject.h:21,
                 from include/linux/device.h:17,
                 from include/linux/dma-mapping.h:5,
                 from arch/powerpc/include/asm/machdep.h:14,
                 from arch/powerpc/include/asm/archrandom.h:6,
                 from include/linux/random.h:81,
                 from include/linux/net.h:22,
                 from include/linux/skbuff.h:27,
                 from include/linux/if_ether.h:23,
                 from net/bridge/br_multicast.c:15:
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
In file included from include/linux/err.h:4:0,
                 from net/bridge/br_multicast.c:13:
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^
In file included from include/linux/idr.h:18:0,
                 from include/linux/kernfs.h:14,
                 from include/linux/sysfs.h:15,
                 from include/linux/kobject.h:21,
                 from include/linux/device.h:17,
                 from include/linux/dma-mapping.h:5,
                 from arch/powerpc/include/asm/machdep.h:14,
                 from arch/powerpc/include/asm/archrandom.h:6,
                 from include/linux/random.h:81,
                 from include/linux/net.h:22,
                 from include/linux/skbuff.h:27,
                 from include/linux/if_ether.h:23,
                 from net/bridge/br_multicast.c:15:
net/bridge/br_multicast.c:2249:25: error: 'struct net_bridge' has no member named 'ip6_querier'
       rcu_dereference(br->ip6_querier.port) == port)
                         ^

Caused by commit 2cd4143192e8 ("bridge: memorize and export selected
IGMP/MLD querier port").  This build has CONFIG_IPV6 not set.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au