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

# Conflicts:
#	drivers/virtio/virtio_mem.c

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/wireless/virtual/mac80211_hwsim.c
Simple merge

diff --cc drivers/virtio/virtio_mem.c
index e8355f55a8f7e8a8ddf4025514c5d171559d8d51,6d4dfbc53a6617d85d472e31687cdec3a2bc8d76..a3857bacc84465eb955aabc451b696f9ec446b79
--- 1/drivers/virtio/virtio_mem.c
--- 2/drivers/virtio/virtio_mem.c
+++ b/drivers/virtio/virtio_mem.c
@@@ -21,7 -21,7 +21,8 @@@
  #include <linux/bitmap.h>
  #include <linux/lockdep.h>
  #include <linux/log2.h>
 +#include <linux/vmalloc.h>
+ #include <linux/suspend.h>
  
  #include <acpi/acpi_numa.h>