]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge commit 'refs/for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 3 Apr 2019 03:42:15 +0000 (13:42 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 3 Apr 2019 03:44:40 +0000 (13:44 +1000)
This pull requests adds initial Mali D71 support into the Arm "komeda" DRM
driver. The code has been reviewed at the end of last year, I just been
too slow with pushing it into mainline. Since it started baking in
linux-next we had a kbuild-bot issue raised and one from Joe Perches on
the MAINTAINERS entry, for which I'm including fixes here.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Liviu Dudau <Liviu.Dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190401192833.GW21747@e110455-lin.cambridge.arm.com
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index dcf0b4f65fbe53cae073a58bdd42a401c052dd37,9fa4686212bddfcd2a5f0153376a52b9414d7b26..e6d476bf9e789e7c10d193d1b6d43b0110867276
@@@ -1167,7 -1167,7 +1167,7 @@@ S:      Supporte
  T:    git git://linux-arm.org/linux-ld.git for-upstream/mali-dp
  F:    drivers/gpu/drm/arm/display/include/
  F:    drivers/gpu/drm/arm/display/komeda/
- F:    Documentation/devicetree/bindings/display/arm/arm,komeda.txt
+ F:    Documentation/devicetree/bindings/display/arm,komeda.txt
  F:    Documentation/gpu/komeda-kms.rst
  
  ARM MALI-DP DRM DRIVER
@@@ -5045,13 -5045,6 +5045,13 @@@ S:    Odd Fixe
  F:    drivers/gpu/drm/udl/
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  
 +DRM DRIVER FOR VIRTUALBOX VIRTUAL GPU
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    dri-devel@lists.freedesktop.org
 +S:    Maintained
 +F:    drivers/gpu/drm/vboxvideo/
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +
  DRM DRIVER FOR VIRTUAL KERNEL MODESETTING (VKMS)
  M:    Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
  R:    Haneen Mohammed <hamohammed.sa@gmail.com>
@@@ -8103,16 -8096,6 +8103,16 @@@ F:    include/linux/iommu.
  F:    include/linux/of_iommu.h
  F:    include/linux/iova.h
  
 +IO_URING
 +M:    Jens Axboe <axboe@kernel.dk>
 +L:    linux-block@vger.kernel.org
 +L:    linux-fsdevel@vger.kernel.org
 +T:    git git://git.kernel.dk/linux-block
 +T:    git git://git.kernel.dk/liburing
 +S:    Maintained
 +F:    fs/io_uring.c
 +F:    include/uapi/linux/io_uring.h
 +
  IP MASQUERADING
  M:    Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
  S:    Maintained