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

Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

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

2018-04-01 19:49:34 -04:00

..

arp_tables.c

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

2018-03-30 11:41:18 -04:00

arpt_mangle.c

netfilter: arpt_mangle: fix return values of checkentry

2011-02-01 16:03:46 +01:00

arptable_filter.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

ip_tables.c

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

2018-03-30 11:41:18 -04:00

ipt_ah.c

netfilter: ipt_ah: return boolean instead of integer

2018-03-05 23:15:43 +01:00

ipt_CLUSTERIP.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

ipt_ECN.c

netfilter: x_tables: use pr ratelimiting in all remaining spots

2018-02-14 21:05:38 +01:00

ipt_MASQUERADE.c

netfilter: nat: add dependencies on conntrack module

2016-12-04 21:16:51 +01:00

ipt_REJECT.c

netfilter: x_tables: use pr ratelimiting in all remaining spots

2018-02-14 21:05:38 +01:00

ipt_rpfilter.c

netfilter: x_tables: use pr ratelimiting in all remaining spots

2018-02-14 21:05:38 +01:00

ipt_SYNPROXY.c

netfilter: ctnetlink: synproxy support

2018-03-20 14:39:31 +01:00

iptable_filter.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

iptable_mangle.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

iptable_nat.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

iptable_raw.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

iptable_security.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

Kconfig

netfilter: nf_tables: build-in filter chain type

2018-03-30 11:29:19 +02:00

Makefile

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

2018-04-01 19:49:34 -04:00

nf_conntrack_l3proto_ipv4.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

nf_conntrack_proto_icmp.c

netfilter: conntrack: timeouts can be const

2018-01-08 18:01:02 +01:00

nf_defrag_ipv4.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

nf_dup_ipv4.c

netfilter: kill the fake untracked conntrack objects

2017-04-15 11:47:57 +02:00

nf_flow_table_ipv4.c

net: rename skb_gso_validate_mtu -> skb_gso_validate_network_len

2018-03-04 17:49:17 -05:00

nf_log_arp.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

nf_log_ipv4.c

net: Drop pernet_operations::async

2018-03-27 13:18:09 -04:00

nf_nat_h323.c

netfilter: nf_nat_h323: fix logical-not-parentheses warning

2017-08-24 18:48:05 +02:00

nf_nat_l3proto_ipv4.c

netfilter: remove defensive check on malformed packets from raw sockets

2018-01-08 18:11:04 +01:00

nf_nat_masquerade_ipv4.c

net: Replace NF_CT_ASSERT() with WARN_ON().

2017-09-04 13:25:19 +02:00

nf_nat_pptp.c

netfilter: pptp: attach nat extension when needed

2017-04-26 09:30:22 +02:00

nf_nat_proto_gre.c

netfilter: gre: Use consistent GRE and PTTP header structure instead of the ones defined by netfilter

2016-09-07 10:36:52 +02:00

nf_nat_proto_icmp.c

net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool

2015-08-17 21:33:06 -07:00

nf_nat_snmp_basic_main.c

netfilter: nf_nat_snmp_basic: use asn1 decoder library

2018-01-19 13:59:07 +01:00

nf_nat_snmp_basic.asn1

netfilter: nf_nat_snmp_basic: use asn1 decoder library

2018-01-19 13:59:07 +01:00

nf_reject_ipv4.c

netfilter: nf_reject_ipv4: Fix use-after-free in send_reset

2017-11-01 12:15:29 +01:00

nf_socket_ipv4.c

netfilter: nf_socket: Fix out of bounds access in nf_sk_lookup_slow_v{4,6}

2018-03-24 21:17:14 +01:00

nft_chain_nat_ipv4.c

netfilter: nf_tables: enable conntrack if NAT chain is registered

2018-03-30 11:29:19 +02:00

nft_chain_route_ipv4.c

netfilter: nf_tables: nft_register_chain_type() returns void

2018-03-30 11:29:18 +02:00

nft_dup_ipv4.c

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

2016-11-15 10:54:36 -05:00

nft_fib_ipv4.c

netfilter: nf_tables: fib: use skb_header_pointer

2017-07-31 19:01:39 +02:00

nft_masq_ipv4.c

netfilter: nf_tables: fix mismatch in big-endian system

2017-03-13 13:30:28 +01:00

nft_redir_ipv4.c

netfilter: nf_tables: fix mismatch in big-endian system

2017-03-13 13:30:28 +01:00

nft_reject_ipv4.c

netfilter: nf_tables: use hook state from xt_action_param structure

2016-11-03 11:52:34 +01:00