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
..
Kconfig	tap: tap as an independent module	2017-02-11 20:59:41 -05:00
Kconfig.vringh
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
scsi.c	vhost: remove unused lock check flag in vhost_dev_cleanup()	2018-02-01 16:26:44 +02:00
test.c	vhost: remove unused lock check flag in vhost_dev_cleanup()	2018-02-01 16:26:44 +02:00
test.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
vhost.c	vhost: validate log when IOTLB is enabled	2018-03-29 16:22:47 -04:00
vhost.h	virtio, vhost: fixes, cleanups, features	2018-02-08 10:41:00 -08:00
vringh.c	vringh: kill off ACCESS_ONCE()	2016-12-16 00:13:36 +02:00
vsock.c	drivers: vhost: vsock: fixed a brace coding style issue	2018-03-09 11:39:44 -05:00