Conflicts: drivers/nfc/microread/mei.c net/netfilter/nfnetlink_queue_core.c Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which some cleanups are going to go on-top. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
af_vsock.c | ||
af_vsock.h | ||
vmci_transport.c | ||
vmci_transport.h | ||
vmci_transport_notify.c | ||
vmci_transport_notify.h | ||
vmci_transport_notify_qstate.c | ||
vsock_addr.c | ||
vsock_addr.h |