iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58717686cf
linux/net/netfilter/ipvs
History
David S. Miller 58717686cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
	drivers/net/ethernet/emulex/benet/be.h
	include/net/tcp.h
	net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-30 03:55:20 -04: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: fix sparse warnings for ip_vs_conn listing 2013-04-23 11:43:05 +09:00
ip_vs_core.c ipvs: Avoid shadowing net variable in ip_vs_leave() 2013-04-23 11:43:06 +09:00
ip_vs_ctl.c ipvs: fix sparse warnings for some parameters 2013-04-23 11:43:05 +09:00
ip_vs_dh.c ipvs: convert services to rcu 2013-04-02 00:23:58 +02:00
ip_vs_est.c ipvs: fix some sparse warnings 2013-03-19 21:18:38 +09: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: fix sparse warnings in lblc and lblcr 2013-04-23 11:43:05 +09:00
ip_vs_lblcr.c ipvs: fix sparse warnings in lblc and lblcr 2013-04-23 11:43:05 +09:00
ip_vs_lc.c ipvs: convert services to rcu 2013-04-02 00:23:58 +02:00
ip_vs_nfct.c ipvs: remove silly double assignment 2012-10-28 22:50:51 +01:00
ip_vs_nq.c ipvs: convert services to rcu 2013-04-02 00:23:58 +02:00
ip_vs_pe_sip.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-30 03:55:20 -04: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 ipvs: off by one in set_sctp_state() 2013-04-23 11:43:06 +09:00
ip_vs_proto_tcp.c ipvs: do not disable bh for long time 2013-04-02 00:23:58 +02: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: do not disable bh for long time 2013-04-02 00:23:58 +02:00
ip_vs_sched.c ipvs: convert services to rcu 2013-04-02 00:23:58 +02:00
ip_vs_sed.c ipvs: convert services to rcu 2013-04-02 00:23:58 +02:00
ip_vs_sh.c ipvs: convert services to rcu 2013-04-02 00:23:58 +02:00
ip_vs_sync.c ipvs: Use network byte order for sync message size 2013-04-23 11:43:06 +09:00
ip_vs_wlc.c ipvs: convert services to rcu 2013-04-02 00:23:58 +02:00
ip_vs_wrr.c ipvs: do not disable bh for long time 2013-04-02 00:23:58 +02:00
ip_vs_xmit.c ipvs: do not disable bh for long time 2013-04-02 00:23:58 +02: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