Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/vhost/vhost.c
Simple merge

diff --cc net/ipv4/ipmr.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge