mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
89d5e23210
Conflicts: net/netfilter/nf_conntrack_proto_tcp.c The conflict had to do with overlapping changes dealing with fixing the use of an "s32" to hold the value returned by NAT_OFFSET(). Pablo Neira Ayuso says: ==================== The following batch contains Netfilter/IPVS updates for your net-next tree. More specifically, they are: * Trivial typo fix in xt_addrtype, from Phil Oester. * Remove net_ratelimit in the conntrack logging for consistency with other logging subsystem, from Patrick McHardy. * Remove unneeded includes from the recently added xt_connlabel support, from Florian Westphal. * Allow to update conntracks via nfqueue, don't need NFQA_CFG_F_CONNTRACK for this, from Florian Westphal. * Remove tproxy core, now that we have socket early demux, from Florian Westphal. * A couple of patches to refactor conntrack event reporting to save a good bunch of lines, from Florian Westphal. * Fix missing locking in NAT sequence adjustment, it did not manifested in any known bug so far, from Patrick McHardy. * Change sequence number adjustment variable to 32 bits, to delay the possible early overflow in long standing connections, also from Patrick. * Comestic cleanups for IPVS, from Dragos Foianu. * Fix possible null dereference in IPVS in the SH scheduler, from Daniel Borkmann. * Allow to attach conntrack expectations via nfqueue. Before this patch, you had to use ctnetlink instead, thus, we save the conntrack lookup. * Export xt_rpfilter and xt_HMARK header files, from Nicolas Dichtel. ==================== Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
ip_vs_app.c | ||
ip_vs_conn.c | ||
ip_vs_core.c | ||
ip_vs_ctl.c | ||
ip_vs_dh.c | ||
ip_vs_est.c | ||
ip_vs_ftp.c | ||
ip_vs_lblc.c | ||
ip_vs_lblcr.c | ||
ip_vs_lc.c | ||
ip_vs_nfct.c | ||
ip_vs_nq.c | ||
ip_vs_pe_sip.c | ||
ip_vs_pe.c | ||
ip_vs_proto_ah_esp.c | ||
ip_vs_proto_sctp.c | ||
ip_vs_proto_tcp.c | ||
ip_vs_proto_udp.c | ||
ip_vs_proto.c | ||
ip_vs_rr.c | ||
ip_vs_sched.c | ||
ip_vs_sed.c | ||
ip_vs_sh.c | ||
ip_vs_sync.c | ||
ip_vs_wlc.c | ||
ip_vs_wrr.c | ||
ip_vs_xmit.c | ||
Kconfig | ||
Makefile |