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
..
af_netlink.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
af_netlink.h	af_netlink: ensure that NLMSG_DONE never fails in dumps	2017-11-13 10:17:13 +09:00
diag.c	rhashtable: Change rhashtable_walk_start to return void	2017-12-11 09:58:38 -05:00
genetlink.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
Kconfig	netlink: remove mmapped netlink support	2016-02-18 11:42:18 -05:00
Makefile	netlink: Diag core and basic socket info dumping (v2)	2013-03-21 12:38:03 -04:00