Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Conflicts:
	net/netfilter/nf_log.c

The conflict in nf_log.c is that in 'net' we added CONFIG_PROC_FS
protection around foo_proc_entry() calls to fix a build failure,
whereas in Pablo's tree a guard if() test around a call is
remove_proc_entry() was removed.  Trivially resolved.

Pablo Neira Ayuso says:

====================
The following patchset contains the first batch of
Netfilter/IPVS updates for your net-next tree, they are:

* Three patches with improvements and code refactorization
  for nfnetlink_queue, from Florian Westphal.

* FTP helper now parses replies without brackets, as RFC1123
  recommends, from Jeff Mahoney.

* Rise a warning to tell everyone about ULOG deprecation,
  NFLOG has been already in the kernel tree for long time
  and supersedes the old logging over netlink stub, from
  myself.

* Don't panic if we fail to load netfilter core framework,
  just bail out instead, from myself.

* Add cond_resched_rcu, used by IPVS to allow rescheduling
  while walking over big hashtables, from Simon Horman.

* Change type of IPVS sysctl_sync_qlen_max sysctl to avoid
  possible overflow, from Zhang Yanfei.

* Use strlcpy instead of strncpy to skip zeroing of already
  initialized area to write the extension names in ebtables,
  from Chen Gang.

* Use already existing per-cpu notrack object from xt_CT,
  from Eric Dumazet.

* Save explicit socket lookup in xt_socket now that we have
  early demux, also from Eric Dumazet.
====================

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
Simple merge

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

diff --cc net/netfilter/ipvs/ip_vs_ctl.c
Simple merge

diff --cc net/netfilter/nf_log.c
index 3b18dd1,bd5474a..4b60a87
--- 1/net/netfilter/nf_log.c
--- 2/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@@ -368,11 -368,7 +368,9 @@@ static int __net_init nf_log_net_init(s
        return 0;
  
  out_sysctl:
-       /* For init_net: errors will trigger panic, don't unroll on error. */
-       if (!net_eq(net, &init_net))
-               remove_proc_entry("nf_log", net->nf.proc_netfilter);
 +#ifdef CONFIG_PROC_FS
+       remove_proc_entry("nf_log", net->nf.proc_netfilter);
 +#endif
        return ret;
  }
  

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

diff --cc net/socket.c
Simple merge