linux/net/netfilter/ipvs
David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
S390 bpf_jit.S is removed in net-next and had changes in 'net',
since that code isn't used any more take the removal.

TLS data structures split the TX and RX components in 'net-next',
put the new struct members from the bug fix in 'net' into the RX
part.

The 'net-next' tree had some reworking of how the ERSPAN code works in
the GRE tunneling code, overlapping with a one-line headroom
calculation fix in 'net'.

Overlapping changes in __sock_map_ctx_update_elem(), keep the bits
that read the prog members via READ_ONCE() into local variables
before using them.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-05-21 16:01:54 -04:00
..
ip_vs_app.c netfilter: delete /proc THIS_MODULE references 2018-01-19 14:10:53 +01:00
ip_vs_conn.c ipvs: fix refcount usage for conns in ops mode 2018-05-08 14:15:12 +02:00
ip_vs_core.c ipvs: fix stats update from local clients 2018-05-08 14:15:21 +02:00
ip_vs_ctl.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next 2018-05-06 21:51:37 -04: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 ipvs: use correct address family in scheduler logs 2014-09-18 08:59:23 +09:00
ip_vs_ftp.c net: Drop pernet_operations::async 2018-03-27 13:18:09 -04: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 ipvs: use correct address family in scheduler logs 2014-09-18 08:59:23 +09:00
ip_vs_mh.c netfilter: ipvs: Add Maglev hashing scheduler 2018-04-09 10:10:57 +03:00
ip_vs_nfct.c netfilter: remove nf_ct_is_untracked 2017-04-15 11:51:33 +02:00
ip_vs_nq.c netfilter: refcounter conversions 2017-03-17 12:49:43 +01:00
ip_vs_ovf.c ipvs: Add ovf scheduler 2015-08-21 09:08:39 -07:00
ip_vs_pe_sip.c ipvs: handle connections started by real-servers 2016-04-20 12:34:17 +10: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: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule 2015-09-24 09:34:41 +09:00
ip_vs_proto_sctp.c License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
ip_vs_proto_tcp.c netfilter: ipvs: Fix space before '[' error. 2018-04-09 10:06:59 +03:00
ip_vs_proto_udp.c netfilter: mark expected switch fall-throughs 2018-01-08 18:01:01 +01:00
ip_vs_proto.c ipvs: remove unused function ip_vs_set_state_timeout 2017-04-28 12:00:10 +02:00
ip_vs_rr.c netfilter: refcounter conversions 2017-03-17 12:49:43 +01: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 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 ipvs: fix rtnl_lock lockups caused by start_sync_thread 2018-04-09 17:05:27 +02: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 ipv6: Count interface receive statistics on the ingress netdev 2018-04-17 13:39:51 -04:00
Kconfig netfilter: ipvs: Add configurations of Maglev hashing 2018-04-09 10:11:18 +03:00
Makefile netfilter: ipvs: Add configurations of Maglev hashing 2018-04-09 10:11:18 +03:00