MAINTAINERS: Restore alphabetical sorting

MAINTAINERS got sorted in

  commit 4400b7d68f6e ("MAINTAINERS: sort entries by entry name")

Merging from drm-next into drm-misc-next duplicated some of the
entries by restoring old, unsorted sections. Restore the sorted
list by removing the duplicates.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: 08d99b2c23df ("Merge drm/drm-next into drm-misc-next")
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Jernej Skrabec <jernej.skrabec@siol.net>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Jerome Brunet <jbrunet@baylibre.com>
Cc: Dariusz Marcinkiewicz <darekm@google.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200423074003.9637-1-tzimmermann@suse.de

diff --git a/MAINTAINERS b/MAINTAINERS
index 4e4883dfdd55a7caf46bb0b271044248a8a328bd..9383160926345d4695736cc3ba4ae36e64e6cb3f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5047,24 +5047,6 @@ F:       Documentation/driver-api/dma-buf.rst
 K:     \bdma_(?:buf|fence|resv)\b
 T:     git git://anongit.freedesktop.org/drm/drm-misc
 
-DMA-BUF HEAPS FRAMEWORK
-M:     Sumit Semwal <sumit.semwal@linaro.org>
-R:     Andrew F. Davis <afd@ti.com>
-R:     Benjamin Gaignard <benjamin.gaignard@linaro.org>
-R:     Liam Mark <lmark@codeaurora.org>
-R:     Laura Abbott <labbott@redhat.com>
-R:     Brian Starkey <Brian.Starkey@arm.com>
-R:     John Stultz <john.stultz@linaro.org>
-S:     Maintained
-L:     linux-media@vger.kernel.org
-L:     dri-devel@lists.freedesktop.org
-L:     linaro-mm-sig@lists.linaro.org (moderated for non-subscribers)
-F:     include/uapi/linux/dma-heap.h
-F:     include/linux/dma-heap.h
-F:     drivers/dma-buf/dma-heap.c
-F:     drivers/dma-buf/heaps/*
-T:     git git://anongit.freedesktop.org/drm/drm-misc
-
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
 M:     Vinod Koul <vkoul@kernel.org>
 L:     dmaengine@vger.kernel.org
@@ -5276,11 +5258,6 @@ S:       Maintained
 F:     drivers/gpu/drm/panel/panel-arm-versatile.c
 F:     Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml
 
-DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
-M:     Dave Airlie <airlied@redhat.com>
-S:     Odd Fixes
-F:     drivers/gpu/drm/ast/
-
 DRM DRIVER FOR ASPEED BMC GFX
 M:     Joel Stanley <joel@jms.id.au>
 L:     linux-aspeed@lists.ozlabs.org
@@ -5468,12 +5445,6 @@ S:       Orphan / Obsolete
 F:     drivers/gpu/drm/sis/
 F:     include/uapi/drm/sis_drm.h
 
-DRM DRIVER FOR SITRONIX ST7701 PANELS
-M:     Jagan Teki <jagan@amarulasolutions.com>
-S:     Maintained
-F:     drivers/gpu/drm/panel/panel-sitronix-st7701.c
-F:     Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
-
 DRM DRIVER FOR SITRONIX ST7586 PANELS
 M:     David Lechner <david@lechnology.com>
 S:     Maintained