Merge tag 'drm-msm-next-2020-01-14' of https://gitlab.freedesktop.org/drm/msm into...

[tomoyo/tomoyo-test1.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 4ae9768..f1e9be2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3150,7 +3150,7 @@ S:        Maintained
 F:     arch/mips/net/
 
 BPF JIT for NFP NICs
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Supported
@@ -4976,6 +4976,24 @@ F:       Documentation/driver-api/dma-buf.rst
 K:     dma_(buf|fence|resv)
 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
@@ -5181,6 +5199,12 @@ T:       git git://anongit.freedesktop.org/drm/drm-misc
 S:     Maintained
 F:     drivers/gpu/drm/bochs/
 
+DRM DRIVER FOR BOE HIMAX8279D PANELS
+M:     Jerry Han <hanxu5@huaqin.corp-partner.google.com>
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-boe-himax8279d.c
+F:     Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
+
 DRM DRIVER FOR FARADAY TVE200 TV ENCODER
 M:     Linus Walleij <linus.walleij@linaro.org>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5336,6 +5360,12 @@ S:       Maintained
 F:     drivers/gpu/drm/tiny/st7735r.c
 F:     Documentation/devicetree/bindings/display/sitronix,st7735r.txt
 
+DRM DRIVER FOR SONY ACX424AKP PANELS
+M:     Linus Walleij <linus.walleij@linaro.org>
+T:     git git://anongit.freedesktop.org/drm/drm-misc
+S:     Maintained
+F:     drivers/gpu/drm/panel/panel-sony-acx424akp.c
+
 DRM DRIVER FOR ST-ERICSSON MCDE
 M:     Linus Walleij <linus.walleij@linaro.org>
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -5408,7 +5438,6 @@ F:        include/linux/vga*
 DRM DRIVERS AND MISC GPU PATCHES
 M:     Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
 M:     Maxime Ripard <mripard@kernel.org>
-M:     Sean Paul <sean@poorly.run>
 W:     https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
 S:     Maintained
 T:     git git://anongit.freedesktop.org/drm/drm-misc
@@ -11431,7 +11460,7 @@ F:      include/uapi/linux/netrom.h
 F:     net/netrom/
 
 NETRONOME ETHERNET DRIVERS
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 L:     oss-drivers@netronome.com
 S:     Maintained
 F:     drivers/net/ethernet/netronome/
@@ -11591,7 +11620,7 @@ M:      Boris Pismenny <borisp@mellanox.com>
 M:     Aviad Yehezkel <aviadye@mellanox.com>
 M:     John Fastabend <john.fastabend@gmail.com>
 M:     Daniel Borkmann <daniel@iogearbox.net>
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     net/tls/*
@@ -11603,7 +11632,7 @@ L:      linux-wireless@vger.kernel.org
 Q:     http://patchwork.kernel.org/project/linux-wireless/list/
 
 NETDEVSIM
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 S:     Maintained
 F:     drivers/net/netdevsim/*
 
@@ -18042,7 +18071,7 @@ XDP (eXpress Data Path)
 M:     Alexei Starovoitov <ast@kernel.org>
 M:     Daniel Borkmann <daniel@iogearbox.net>
 M:     David S. Miller <davem@davemloft.net>
-M:     Jakub Kicinski <jakub.kicinski@netronome.com>
+M:     Jakub Kicinski <kuba@kernel.org>
 M:     Jesper Dangaard Brouer <hawk@kernel.org>
 M:     John Fastabend <john.fastabend@gmail.com>
 L:     netdev@vger.kernel.org