David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

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

2014-01-06 17:37:45 -05: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: drop SCTP connections depending on state

2013-06-26 18:01:46 +09:00

ip_vs_core.c

netfilter: push reasm skb through instead of original frag skbs

2013-11-11 00:19:35 -05:00

ip_vs_ctl.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-11-19 15:50:47 -08:00

ip_vs_dh.c

ipvs: provide iph to schedulers

2013-06-26 18:01:45 +09:00

ip_vs_est.c

ipvs: stats should not depend on CPU 0

2013-09-18 14:40:20 -05:00

ip_vs_ftp.c

ipvs: do not disable bh for long time

2013-04-02 00:23:58 +02:00

ip_vs_lblc.c

ipvs: avoid rcu_barrier during netns cleanup

2013-10-15 10:36:01 +09:00

ip_vs_lblcr.c

ipvs: avoid rcu_barrier during netns cleanup

2013-10-15 10:36:01 +09:00

ip_vs_lc.c

ipvs: provide iph to schedulers

2013-06-26 18:01:45 +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: fix overflow on dest weight multiply

2013-09-18 14:38:53 -05: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

ipvs: convert services to rcu

2013-04-02 00:23:58 +02: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

net: ipvs: sctp: do not recalc sctp csum when ports didn't change

2013-10-30 09:48:16 +09:00

ip_vs_proto_tcp.c

ipvs: sloppy TCP and SCTP

2013-06-26 18:01:46 +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: provide iph to schedulers

2013-06-26 18:01:45 +09:00

ip_vs_sched.c

ipvs: convert services to rcu

2013-04-02 00:23:58 +02:00

ip_vs_sed.c

ipvs: fix overflow on dest weight multiply

2013-09-18 14:38:53 -05:00

ip_vs_sh.c

ipvs: improved SH fallback strategy

2013-10-15 10:54:50 +09:00

ip_vs_sync.c

ipvs: Remove unused variable ret from sync_thread_master()

2013-12-27 12:19:32 +09:00

ip_vs_wlc.c

ipvs: fix overflow on dest weight multiply

2013-09-18 14:38:53 -05:00

ip_vs_wrr.c

ipvs: provide iph to schedulers

2013-06-26 18:01:45 +09:00

ip_vs_xmit.c

ip: generate unique IP identificator if local fragmentation is allowed

2013-09-19 14:11:15 -04:00

Kconfig

ipvs: Complete IPv6 fragment handling for IPVS

2012-09-28 11:34:24 +09:00

Makefile

IPVS: sip persistence engine

2010-10-04 22:45:24 +09:00