Messages in this thread | | | Date | Wed, 6 Nov 2013 19:55:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the net-next tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in net/netfilter/ipset/ip_set_hash_netnet.c between commit 1a869205c75c ("netfilter: ipset: The unnamed union initialization may lead to compilation error") from the net-next tree and commit "net/netfilter/ipset/ip_set_hash_netnet.c: fix build with older gcc" from the akpm tree.
The latter is a subset of the former. so I just dropped the latter.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |