Merge branch 'master' of git://1984.lsi.us.es/nf-next

Pablo Neira Ayuso says:

====================
The following patchset contains Netfilter and IPVS updates for
your net-next tree, most relevantly they are:

* Add net namespace support to NFLOG, ULOG and ebt_ulog and NFQUEUE.
  The LOG and ebt_log target has been also adapted, but they still
  depend on the syslog netnamespace that seems to be missing, from
  Gao Feng.

* Don't lose indications of congestion in IPv6 fragmentation handling,
  from Hannes Frederic Sowa.i

* IPVS conversion to use RCU, including some code consolidation patches
  and optimizations, also some from Julian Anastasov.

* cpu fanout support for NFQUEUE, from Holger Eitzenberger.

* Better error reporting to userspace when dropping packets from
  all our _*_[xfrm|route]_me_harder functions, from Patrick McHardy.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc net/bridge/netfilter/ebt_ulog.c
Simple merge

diff --cc net/ipv4/netfilter/ipt_ULOG.c
index e7f8cad11393509919492a5d2ac1ff5de89b1031,642ecfb711bc989a9c23a4f2346587dc1714ddaf..8799c836ccaa002a9e72a324fe32b8ec4168f5e6
--- 1/net/ipv4/netfilter/ipt_ULOG.c
--- 2/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@@ -172,11 -187,11 +187,11 @@@ static void ipt_ulog_packet(unsigned in
        else
                copy_len = loginfo->copy_range;
  
 -      size = NLMSG_SPACE(sizeof(*pm) + copy_len);
 +      size = nlmsg_total_size(sizeof(*pm) + copy_len);
  
-       ub = &ulog_buffers[groupnum];
+       ub = &ulog->ulog_buffers[groupnum];
  
-       spin_lock_bh(&ulog_lock);
+       spin_lock_bh(&ulog->lock);
  
        if (!ub->skb) {
                if (!(ub->skb = ulog_alloc_skb(size)))

diff --cc net/netfilter/nfnetlink_log.c
Simple merge

diff --cc net/netfilter/nfnetlink_queue_core.c
Simple merge