David S. Miller a655fe9f19 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... An ipvlan bug fix in 'net' conflicted with the abstraction away of the IPV6 specific support in 'net-next'. Similarly, a bug fix for mlx5 in 'net' conflicted with the flow action conversion in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-02-08 15:00:17 -08:00
..
af_vsock_tap.c	VSOCK: Add vsockmon tap functions	2017-04-24 12:35:56 -04:00
af_vsock.c	socket: move compat timeout handling into sock.c	2019-02-03 11:17:30 -08:00
diag.c	VSOCK: add sock_diag interface	2017-10-05 18:44:17 -07:00
hyperv_transport.c	VSOCK: fix outdated sk_state value in hvs_release()	2017-12-05 15:07:37 -05:00
Kconfig	VSOCK: add sock_diag interface	2017-10-05 18:44:17 -07:00
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
virtio_transport_common.c	VSOCK: use TCP state constants for sk_state	2017-10-05 18:44:17 -07:00
virtio_transport.c	vsock/virtio: reset connected sockets on device removal	2019-02-03 11:06:25 -08:00
vmci_transport_notify_qstate.c	VSOCK: use TCP state constants for sk_state	2017-10-05 18:44:17 -07:00
vmci_transport_notify.c	VSOCK: use TCP state constants for sk_state	2017-10-05 18:44:17 -07:00
vmci_transport_notify.h	VSOCK: constify vmci_transport_notify_ops structures	2015-11-23 15:49:29 -05:00
vmci_transport.c	VSOCK: Send reset control packet when socket is partially bound	2018-12-18 11:53:42 -08:00
vmci_transport.h	VSOCK: constify vmci_transport_notify_ops structures	2015-11-23 15:49:29 -05:00
vsock_addr.c	VSOCK: Move af_vsock.h and vsock_addr.h to include/net	2013-07-27 22:14:06 -07:00