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
..
datagram.c
dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
dev_addr_lists.c
dev_ioctl.c	net: don't unnecessarily load kernel modules in dev_ioctl()	2018-03-07 15:12:58 -05:00
devlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-23 11:31:58 -04:00
drop_monitor.c
dst.c
dst_cache.c	net: core: dst_cache_set_ip6: Rename 'addr' parameter to 'saddr' for consistency	2018-03-05 12:52:45 -05:00
ethtool.c	ethtool: enable Inline TLS in HW	2018-03-31 23:37:32 -04:00
fib_notifier.c	net: Fix fib notifer to return errno	2018-03-29 14:10:30 -04:00
fib_rules.c	net: Move call_fib_rule_notifiers up in fib_nl_newrule	2018-03-29 14:10:30 -04:00
filter.c	bpf: Post-hooks for sys_bind	2018-03-31 02:16:26 +02:00
flow_dissector.c	net: Remove unused get_hash_from_flow functions	2018-03-04 13:04:23 -05:00
gen_estimator.c	net_sched: gen_estimator: fix broken estimators based on percpu stats	2018-02-23 12:35:46 -05:00
gen_stats.c
gro_cells.c
hwbm.c
link_watch.c
lwt_bpf.c
lwtunnel.c
Makefile
neighbour.c
net-procfs.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
net-sysfs.c	net: Use octal not symbolic permissions	2018-03-26 12:07:48 -04:00
net-sysfs.h
net-traces.c
net_namespace.c	net: Do not take net_rwsem in __rtnl_link_unregister()	2018-03-31 22:24:58 -04:00
netclassid_cgroup.c
netevent.c
netpoll.c
netprio_cgroup.c
pktgen.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
ptp_classifier.c
request_sock.c
rtnetlink.c	net: Do not take net_rwsem in __rtnl_link_unregister()	2018-03-31 22:24:58 -04:00
scm.c
secure_seq.c
skbuff.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
sock.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
sock_diag.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
sock_reuseport.c
stream.c
sysctl_net_core.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
timestamping.c
tso.c
utils.c
xdp.c