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
..
bond_3ad.c
bond_alb.c	locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()	2017-10-25 11:01:08 +02:00
bond_debugfs.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
bond_main.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
bond_netlink.c	bonding: use nla_get_u64 to extract the value for IFLA_BOND_AD_ACTOR_SYSTEM	2017-11-28 15:56:40 -05:00
bond_options.c	net: bonding: Replace mac address parsing	2017-12-20 12:47:29 -05:00
bond_procfs.c	drivers/net: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
bond_sysfs_slave.c	drivers/net: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
bond_sysfs.c	drivers/net: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
bonding_priv.h
Makefile