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

Hi all,

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

In file included from include/linux/tcp.h:23:0,
                 from include/linux/ipv6.h:63,
                 from include/net/ipv6.h:16,
                 from include/linux/sunrpc/clnt.h:27,
                 from include/linux/nfs_fs.h:30,
                 from init/do_mounts.c:32:
include/net/ipv6.h: In function 'ip6_set_txhash':
include/net/sock.h:327:33: error: 'struct sock_common' has no member named 'skc_v6_daddr'
 #define sk_v6_daddr  __sk_common.skc_v6_daddr
                                 ^
include/net/ipv6.h:695:49: note: in expansion of macro 'sk_v6_daddr'
  keys.dst = (__force __be32)ipv6_addr_hash(&sk->sk_v6_daddr);
                                                 ^
In file included from include/linux/sunrpc/clnt.h:27:0,
                 from include/linux/nfs_fs.h:30,
                 from init/do_mounts.c:32:
include/net/ipv6.h: In function 'ip6_make_flowlabel':
include/net/ipv6.h:705:37: error: 'struct net' has no member named 'ipv6'
  if (!flowlabel && (autolabel || net->ipv6.sysctl.auto_flowlabels)) {
                                     ^

And lots more ...

Caused by commits b73c3d0e4f0e ("net: Save TX flow hash in sock and set
in skbuf on xmit") and cb1ce2ef387b ("ipv6: Implement automatic flow
label generation on transmit").  This build has CONFIG_IPV6 unset.

I have used the net-next tree from next-20140708 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

From: Stephen Rothwell <redacted>
Date: Wed, 9 Jul 2014 13:26:19 +1000

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

This got fixed 5 minutes ago.

Hi David,

On Tue, 08 Jul 2014 20:47:51 -0700 (PDT) David Miller [off-list ref] wrote:

From: Stephen Rothwell <redacted>
Date: Wed, 9 Jul 2014 13:26:19 +1000

quoted

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

This got fixed 5 minutes ago.

Thanks, I guess that will be picked up tomorrow.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au