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

..

netfilter

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

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

af_inet.c

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

2018-03-31 23:33:04 -04:00

ah4.c

…

arp.c

net: Drop pernet_operations::async

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

cipso_ipv4.c

…

datagram.c

…

devinet.c

net: Drop pernet_operations::async

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

esp4_offload.c

esp: check the NETIF_F_HW_ESP_TX_CSUM bit before segmenting

2018-02-27 10:46:01 +01:00

esp4.c

…

fib_frontend.c

net: Drop pernet_operations::async

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

fib_lookup.h

…

fib_notifier.c

…

fib_rules.c

ipv6: route: dissect flow in input path if fib rules need it

2018-02-28 22:44:44 -05:00

fib_semantics.c

net/ipv4: Pass net to fib_multipath_hash instead of fib_info

2018-03-04 13:04:21 -05:00

fib_trie.c

net/ipv4: Allow notifier to fail route replace

2018-03-29 14:10:30 -04:00

fou.c

net: Drop pernet_operations::async

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

gre_demux.c

…

gre_offload.c

…

icmp.c

net: Drop pernet_operations::async

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

igmp.c

net: Drop pernet_operations::async

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

inet_connection_sock.c

…

inet_diag.c

sock_diag: request _diag module only when the family or proto has been registered

2018-03-12 11:03:42 -04:00

inet_fragment.c

inet: frags: remove inet_frag_maybe_warn_overflow()

2018-03-31 23:25:39 -04:00

inet_hashtables.c

…

inet_timewait_sock.c

…

inetpeer.c

net: make kmem caches as __ro_after_init

2018-02-26 15:11:48 -05:00

ip_forward.c

net: rename skb_gso_validate_mtu -> skb_gso_validate_network_len

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

ip_fragment.c

inet: frags: get rid of ipfrag_skb_cb/FRAG_CB

2018-03-31 23:25:40 -04:00

ip_gre.c

net: Drop pernet_operations::async

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

ip_input.c

net: Make ip_ra_chain per struct net

2018-03-22 15:12:56 -04:00

ip_options.c

…

ip_output.c

ipv4: factorize sk_wmem_alloc updates done by __ip_append_data()

2018-04-01 14:08:21 -04:00

ip_sockglue.c

net: Replace ip_ra_lock with per-net mutex

2018-03-22 15:12:56 -04:00

ip_tunnel_core.c

…

ip_tunnel.c

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

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

ip_vti.c

net: Drop pernet_operations::async

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

ipcomp.c

…

ipconfig.c

net: Use octal not symbolic permissions

2018-03-26 12:07:48 -04:00

ipip.c

net: Drop pernet_operations::async

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

ipmr_base.c

ipmr: Make ipmr_dump() common

2018-03-26 13:14:43 -04:00

ipmr.c

net: Drop pernet_operations::async

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

Kconfig

ipmr,ipmr6: Define a uniform vif_device

2018-03-01 13:13:23 -05:00

Makefile

ipmr,ipmr6: Define a uniform vif_device

2018-03-01 13:13:23 -05:00

netfilter.c

…

ping.c

net: Drop pernet_operations::async

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

proc.c

inet: frags: break the 2GB limit for frags storage

2018-03-31 23:25:39 -04:00

protocol.c

…

raw_diag.c

…

raw.c

net: Drop pernet_operations::async

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

route.c

net: Drop pernet_operations::async

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

syncookies.c

net/ipv4: disable SMC TCP option with SYN Cookies

2018-03-25 20:53:54 -04:00

sysctl_net_ipv4.c

net: Drop pernet_operations::async

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

tcp_bbr.c

net-tcp_bbr: set tp->snd_ssthresh to BDP upon STARTUP exit

2018-03-16 15:07:48 -04:00

tcp_bic.c

…

tcp_cdg.c

…

tcp_cong.c

…

tcp_cubic.c

…

tcp_dctcp.c

…

tcp_diag.c

…

tcp_fastopen.c

…

tcp_highspeed.c

…

tcp_htcp.c

…

tcp_hybla.c

…

tcp_illinois.c

net/tcp/illinois: replace broken algorithm reference link

2018-02-28 12:03:47 -05:00

tcp_input.c

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

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

tcp_ipv4.c

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

2018-03-31 23:33:04 -04:00

tcp_lp.c

…

tcp_metrics.c

net: Drop pernet_operations::async

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

tcp_minisocks.c

crypto : chtls - CPL handler definition

2018-03-31 23:37:32 -04:00

tcp_nv.c

…

tcp_offload.c

…

tcp_output.c

tcp_bbr: better deal with suboptimal GSO (II)

2018-03-01 21:44:28 -05:00

tcp_rate.c

…

tcp_recovery.c

…

tcp_scalable.c

…

tcp_timer.c

tcp: purge write queue upon aborting the connection

2018-03-07 15:01:03 -05:00

tcp_ulp.c

…

tcp_vegas.c

…

tcp_vegas.h

…

tcp_veno.c

…

tcp_westwood.c

…

tcp_yeah.c

…

tcp.c

bpf: sockmap redirect ingress support

2018-03-30 00:09:43 +02:00

tunnel4.c

inet: whitespace cleanup

2018-02-28 11:43:28 -05:00

udp_diag.c

…

udp_impl.h

…

udp_offload.c

…

udp_tunnel.c

…

udp.c

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

2018-03-31 23:33:04 -04:00

udplite.c

net: Drop pernet_operations::async

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

xfrm4_input.c

…

xfrm4_mode_beet.c

…

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

xfrm: Verify MAC header exists before overwriting eth_hdr(skb)->h_proto

2018-03-07 10:54:29 +01:00

xfrm4_output.c

net: xfrm: use skb_gso_validate_network_len() to check gso sizes

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

xfrm4_policy.c

net: Drop pernet_operations::async

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

xfrm4_protocol.c

…

xfrm4_state.c

…

xfrm4_tunnel.c

…