Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio updates from Michael Tsirkin:

 - virtio-mem: paravirtualized memory hotplug

 - support doorbell mapping for vdpa

 - config interrupt support in ifc

 - fixes all over the place

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (40 commits)
  vhost/test: fix up after API change
  virtio_mem: convert device block size into 64bit
  virtio-mem: drop unnecessary initialization
  ifcvf: implement config interrupt in IFCVF
  vhost: replace -1 with VHOST_FILE_UNBIND in ioctls
  vhost_vdpa: Support config interrupt in vdpa
  ifcvf: ignore continuous setting same status value
  virtio-mem: Don't rely on implicit compiler padding for requests
  virtio-mem: Try to unplug the complete online memory block first
  virtio-mem: Use -ETXTBSY as error code if the device is busy
  virtio-mem: Unplug subblocks right-to-left
  virtio-mem: Drop manual check for already present memory
  virtio-mem: Add parent resource for all added "System RAM"
  virtio-mem: Better retry handling
  virtio-mem: Offline and remove completely unplugged memory blocks
  mm/memory_hotplug: Introduce offline_and_remove_memory()
  virtio-mem: Allow to offline partially unplugged memory blocks
  mm: Allow to offline unmovable PageOffline() pages via MEM_GOING_OFFLINE
  virtio-mem: Paravirtualized memory hotunplug part 2
  virtio-mem: Paravirtualized memory hotunplug part 1
  ...

diff --cc MAINTAINERS
Simple merge

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

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

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

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

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

diff --cc include/linux/memory_hotplug.h
index fee7fab,cb74998..3755158
--- 1/include/linux/memory_hotplug.h
--- 2/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@@ -318,8 -319,15 +318,9 @@@ extern void try_offline_node(int nid)
  extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
  extern int remove_memory(int nid, u64 start, u64 size);
  extern void __remove_memory(int nid, u64 start, u64 size);
+ extern int offline_and_remove_memory(int nid, u64 start, u64 size);
  
  #else
 -static inline bool is_mem_section_removable(unsigned long pfn,
 -                                      unsigned long nr_pages)
 -{
 -      return false;
 -}
 -
  static inline void try_offline_node(int nid) {}
  
  static inline int offline_pages(unsigned long start_pfn, unsigned long nr_pages)

diff --cc mm/memory_hotplug.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge