Pablo Neira Ayuso f0a0a978b6 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ... This merge resolves conflicts with 75aec9df3a ("bridge: Remove br_nf_push_frag_xmit_sk") as part of Eric Biederman's effort to improve netns support in the network stack that reached upstream via David's net-next tree. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Conflicts: net/bridge/br_netfilter_hooks.c		2015-10-17 14:28:03 +02:00
..
Kconfig	ipvs: Add ovf scheduler	2015-08-21 09:08:39 -07:00
Makefile	ipvs: Add ovf scheduler	2015-08-21 09:08:39 -07:00
ip_vs_app.c	ipvs: Pass ipvs not net into ip_vs_app_net_init and ip_vs_app_net_cleanup	2015-09-24 09:34:40 +09:00
ip_vs_conn.c	ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup}	2015-10-07 10:12:00 +09:00
ip_vs_core.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2015-10-17 14:28:03 +02:00
ip_vs_ctl.c	ipvs: Remove skb_sknet	2015-09-24 09:34:43 +09:00
ip_vs_dh.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_est.c	ipvs: Pass ipvs not net to ip_vs_estimator_net_init and ip_vs_estimator_cleanup	2015-09-24 09:34:39 +09:00
ip_vs_fo.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_ftp.c	ipvs: Remove net argument from ip_vs_tcp_conn_listen	2015-09-24 09:34:43 +09:00
ip_vs_lblc.c	ipvs: Store ipvs not net in struct ip_vs_service	2015-09-24 09:34:33 +09:00
ip_vs_lblcr.c	ipvs: Store ipvs not net in struct ip_vs_service	2015-09-24 09:34:33 +09:00
ip_vs_lc.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_nfct.c	ipvs: Pass ipvs not net to ip_vs_fill_conn	2015-09-24 09:34:33 +09:00
ip_vs_nq.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_ovf.c	ipvs: Add ovf scheduler	2015-08-21 09:08:39 -07:00
ip_vs_pe.c	netfilter: Deletion of unnecessary checks before two function calls	2014-11-20 13:08:43 +01:00
ip_vs_pe_sip.c	ipvs: Add hdr_flags to iphdr	2015-09-01 10:33:26 +09:00
ip_vs_proto.c	ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|cleanup)	2015-09-24 09:34:43 +09:00
ip_vs_proto_ah_esp.c	ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule	2015-09-24 09:34:41 +09:00
ip_vs_proto_sctp.c	ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule	2015-09-24 09:34:41 +09:00
ip_vs_proto_tcp.c	ipvs: Remove net argument from ip_vs_tcp_conn_listen	2015-09-24 09:34:43 +09:00
ip_vs_proto_udp.c	ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule	2015-09-24 09:34:41 +09:00
ip_vs_rr.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_sched.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next	2015-08-04 23:57:45 -07:00
ip_vs_sed.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_sh.c	ipvs: sh: support scheduling icmp/inverse packets consistently	2015-09-01 10:33:52 +09:00
ip_vs_sync.c	ipvs: Pass ipvs not net to ip_vs_sync_net_cleanup	2015-09-24 09:34:38 +09:00
ip_vs_wlc.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_wrr.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_xmit.c	ipv4, ipv6: Pass net into ip_local_out and ip6_local_out	2015-10-08 04:27:02 -07:00