mirror of https://gitee.com/openkylin/linux.git
ac80010fc9
Mere overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
af_vsock.c | ||
af_vsock_tap.c | ||
diag.c | ||
hyperv_transport.c | ||
virtio_transport.c | ||
virtio_transport_common.c | ||
vmci_transport.c | ||
vmci_transport.h | ||
vmci_transport_notify.c | ||
vmci_transport_notify.h | ||
vmci_transport_notify_qstate.c | ||
vsock_addr.c | ||
vsock_loopback.c |