Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/kernel/crash_dump.c
Simple merge

diff --cc drivers/block/virtio_blk.c
Simple merge

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

diff --cc fs/proc/vmcore.c
Simple merge