David S. Miller 375ca548f7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two easily resolvable overlapping change conflicts, one in
TCP and one in the eBPF verifier.

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

2019-02-20 00:34:07 -08:00

..

ip_vs_app.c

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

2018-06-06 18:39:49 -07:00

ip_vs_conn.c

ipvs: don't show negative times in ip_vs_conn

2018-08-16 19:36:57 +02:00

ip_vs_core.c

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

2019-02-15 12:38:38 -08:00

ip_vs_ctl.c

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

2019-02-20 00:34:07 -08:00

ip_vs_dh.c

ipvs: fix multiplicative hashing in sh/dh/lblc/lblcr algorithms

2018-04-09 10:15:27 +03:00

ip_vs_est.c

netfilter: ipvs: Convert timers to use timer_setup()

2017-11-08 15:53:58 -08:00

ip_vs_fo.c

…

ip_vs_ftp.c

ipvs: add ipv6 support to ftp

2018-06-01 14:01:54 +02:00

ip_vs_lblc.c

ipvs: initialize tbl->entries in ip_vs_lblc_init_svc()

2018-04-27 00:20:33 +02:00

ip_vs_lblcr.c

ipvs: initialize tbl->entries after allocation

2018-04-27 00:20:33 +02:00

ip_vs_lc.c

…

ip_vs_mh.c

treewide: convert ISO_8859-1 text comments to utf-8

2018-08-23 18:48:43 -07:00

ip_vs_nfct.c

ipvs: add full ipv6 support to nfct

2018-06-01 14:01:54 +02:00

ip_vs_nq.c

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

ip_vs_ovf.c

…

ip_vs_pe_sip.c

…

ip_vs_pe.c

…

ip_vs_proto_ah_esp.c

ipvs: avoid indirect calls when calculating checksums

2019-01-28 11:15:58 +01:00

ip_vs_proto_sctp.c

ipvs: avoid indirect calls when calculating checksums

2019-01-28 11:15:58 +01:00

ip_vs_proto_tcp.c

ipvs: use indirect call wrappers

2019-01-28 11:15:58 +01:00

ip_vs_proto_udp.c

ipvs: use indirect call wrappers

2019-01-28 11:15:58 +01:00

ip_vs_proto.c

ipvs: add assured state for conn templates

2018-07-18 11:26:40 +02:00

ip_vs_rr.c

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

ip_vs_sched.c

…

ip_vs_sed.c

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

ip_vs_sh.c

ipvs: fix multiplicative hashing in sh/dh/lblc/lblcr algorithms

2018-04-09 10:15:27 +03:00

ip_vs_sync.c

iov_iter: Separate type from direction and use accessor functions

2018-10-24 00:41:07 +01:00

ip_vs_wlc.c

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

ip_vs_wrr.c

netfilter: refcounter conversions

2017-03-17 12:49:43 +01:00

ip_vs_xmit.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

2018-06-11 14:24:32 -07:00

Kconfig

ipvs: fix dependency on nf_defrag_ipv6

2019-02-12 11:24:01 +01:00

Makefile

netfilter: ipvs: Add configurations of Maglev hashing

2018-04-09 10:11:18 +03:00