David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
ip_vs_app.c	ipvs: do not disable bh for long time	2013-04-02 00:23:58 +02:00
ip_vs_conn.c	ipvs: use the new dest addr family field	2014-09-18 08:59:28 +09:00
ip_vs_core.c	ipvs: rerouting to local clients is not needed anymore	2015-01-30 10:05:55 +09:00
ip_vs_ctl.c	netlink: make nlmsg_end() and genlmsg_end() void	2015-01-18 01:03:45 -05: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: stats should not depend on CPU 0	2013-09-18 14:40:20 -05: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: uninitialized data with IP_VS_IPV6	2014-12-10 17:36:47 +09:00
ip_vs_lblc.c	ipvs: address family of LBLC entry depends on svc family	2014-09-16 09:03:38 +09:00
ip_vs_lblcr.c	ipvs: address family of LBLCR entry depends on svc family	2014-09-16 09:03:38 +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	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-01-06 17:37:45 -05:00
ip_vs_nq.c	ipvs: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_pe_sip.c	netfilter: push reasm skb through instead of original frag skbs	2013-11-11 00:19:35 -05:00
ip_vs_pe.c	netfilter: Deletion of unnecessary checks before two function calls	2014-11-20 13:08:43 +01:00
ip_vs_proto_ah_esp.c	ipvs: API change to avoid rescan of IPv6 exthdr	2012-09-28 11:34:33 +09:00
ip_vs_proto_sctp.c	ipvs: use the new dest addr family field	2014-09-18 08:59:28 +09:00
ip_vs_proto_tcp.c	ipvs: use the new dest addr family field	2014-09-18 08:59:28 +09:00
ip_vs_proto_udp.c	ipvs: convert services to rcu	2013-04-02 00:23:58 +02:00
ip_vs_proto.c	ipvs: Trivial changes, use compressed IPv6 address in output	2012-09-28 11:33:52 +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	netfilter: Deletion of unnecessary checks before two function calls	2014-11-20 13:08:43 +01: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: use correct address family in scheduler logs	2014-09-18 08:59:23 +09:00
ip_vs_sync.c	netfilter: Deletion of unnecessary checks before two function calls	2014-11-20 13:08:43 +01: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	dst: no need to take reference on DST_NOCACHE dsts	2014-12-09 16:08:17 -05:00
Kconfig	ipvs: Add simple weighted failover scheduler	2014-09-16 09:03:32 +09:00
Makefile	ipvs: Add simple weighted failover scheduler	2014-09-16 09:03:32 +09:00