Merge remote-tracking branch 'virtio/virtio-next'

diff --cc drivers/char/hw_random/virtio-rng.c
Simple merge

diff --cc drivers/char/virtio_console.c
Simple merge

diff --cc drivers/net/caif/Kconfig
Simple merge

diff --cc drivers/net/caif/Makefile
index 15a9d2fc753dcc8ef1ea6153b3be59c3ed6d5eb7,d9ee26a96c6e19b8699358a79c2a3a6bed325382..9bbd45391f6cd00ea52772260c666bdcb579109c
--- 1/drivers/net/caif/Makefile
--- 2/drivers/net/caif/Makefile
+++ b/drivers/net/caif/Makefile
@@@ -7,5 -7,12 +7,8 @@@ obj-$(CONFIG_CAIF_TTY) += caif_serial.
  cfspi_slave-objs := caif_spi.o caif_spi_slave.o
  obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o
  
 -# Shared memory
 -caif_shm-objs := caif_shmcore.o caif_shm_u5500.o
 -obj-$(CONFIG_CAIF_SHM) += caif_shm.o
 -
  # HSI interface
  obj-$(CONFIG_CAIF_HSI) += caif_hsi.o
+ 
+ # Virtio interface
+ obj-$(CONFIG_CAIF_VIRTIO) += caif_virtio.o

diff --cc drivers/net/virtio_net.c
Simple merge

diff --cc include/linux/virtio.h
Simple merge

diff --cc net/9p/trans_virtio.c
Simple merge