Merge patch series "RISC-V Hibernation Support"

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a53a1a29b10cc3c635f754f999d3c98b7240ecb1..4e93707933000b591cad42b113773e93342d23b6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7564,12 +7564,6 @@ T:       git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/em28xx*
 F:     drivers/media/usb/em28xx/
 
-EMBEDDED LINUX
-M:     Olivia Mackall <olivia@selenic.com>
-M:     David Woodhouse <dwmw2@infradead.org>
-L:     linux-embedded@vger.kernel.org
-S:     Maintained
-
 EMMC CMDQ HOST CONTROLLER INTERFACE (CQHCI) DRIVER
 M:     Adrian Hunter <adrian.hunter@intel.com>
 M:     Ritesh Harjani <riteshh@codeaurora.org>
@@ -9588,6 +9582,7 @@ S:        Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 F:     Documentation/ABI/testing/debugfs-hyperv
+F:     Documentation/devicetree/bindings/bus/microsoft,vmbus.yaml
 F:     Documentation/virt/hyperv
 F:     Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst
 F:     arch/arm64/hyperv
@@ -9905,6 +9900,11 @@ F:       drivers/crypto/vmx/ghash*
 F:     drivers/crypto/vmx/ppc-xlate.pl
 F:     drivers/crypto/vmx/vmx.c
 
+IBM Power VFIO Support
+M:     Timothy Pearson <tpearson@raptorengineering.com>
+S:     Supported
+F:     drivers/vfio/vfio_iommu_spapr_tce.c
+
 IBM ServeRAID RAID DRIVER
 S:     Orphan
 F:     drivers/scsi/ips.*
@@ -13456,13 +13456,14 @@ F:    arch/powerpc/include/asm/membarrier.h
 F:     include/uapi/linux/membarrier.h
 F:     kernel/sched/membarrier.c
 
-MEMBLOCK
+MEMBLOCK AND MEMORY MANAGEMENT INITIALIZATION
 M:     Mike Rapoport <rppt@kernel.org>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     Documentation/core-api/boot-time-mm.rst
 F:     include/linux/memblock.h
 F:     mm/memblock.c
+F:     mm/mm_init.c
 F:     tools/testing/memblock/
 
 MEMORY CONTROLLER DRIVERS
@@ -13497,6 +13498,7 @@ F:      include/linux/memory_hotplug.h
 F:     include/linux/mm.h
 F:     include/linux/mmzone.h
 F:     include/linux/pagewalk.h
+F:     include/trace/events/ksm.h
 F:     mm/
 F:     tools/mm/
 F:     tools/testing/selftests/mm/
@@ -13505,6 +13507,7 @@ VMALLOC
 M:     Andrew Morton <akpm@linux-foundation.org>
 R:     Uladzislau Rezki <urezki@gmail.com>
 R:     Christoph Hellwig <hch@infradead.org>
+R:     Lorenzo Stoakes <lstoakes@gmail.com>
 L:     linux-mm@kvack.org
 S:     Maintained
 W:     http://www.linux-mm.org
@@ -15182,8 +15185,8 @@ OBJTOOL
 M:     Josh Poimboeuf <jpoimboe@kernel.org>
 M:     Peter Zijlstra <peterz@infradead.org>
 S:     Supported
+F:     include/linux/objtool*.h
 F:     tools/objtool/
-F:     include/linux/objtool.h
 
 OCELOT ETHERNET SWITCH DRIVER
 M:     Vladimir Oltean <vladimir.oltean@nxp.com>
@@ -21513,10 +21516,8 @@ F:     include/uapi/linux/ublk_cmd.h
 UCLINUX (M68KNOMMU AND COLDFIRE)
 M:     Greg Ungerer <gerg@linux-m68k.org>
 L:     linux-m68k@lists.linux-m68k.org
-L:     uclinux-dev@uclinux.org  (subscribers-only)
 S:     Maintained
 W:     http://www.linux-m68k.org/
-W:     http://www.uclinux.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
 F:     arch/m68k/*/*_no.*
 F:     arch/m68k/68*/
@@ -22212,6 +22213,7 @@ F:      include/uapi/linux/virtio_console.h
 VIRTIO CORE AND NET DRIVERS
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 M:     Jason Wang <jasowang@redhat.com>
+R:     Xuan Zhuo <xuanzhuo@linux.alibaba.com>
 L:     virtualization@lists.linux-foundation.org
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-vdpa
@@ -22225,6 +22227,7 @@ F:      drivers/vdpa/
 F:     drivers/virtio/
 F:     include/linux/vdpa.h
 F:     include/linux/virtio*.h
+F:     include/linux/vringh.h
 F:     include/uapi/linux/virtio_*.h
 F:     tools/virtio/