[Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree

Stephen Rothwell sfr at canb.auug.org.au
Thu Apr 16 01:25:19 UTC 2020


Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  MAINTAINERS

between commits:

  4400b7d68f6e ("MAINTAINERS: sort entries by entry name")
  3b50142d8528 ("MAINTAINERS: sort field names for all entries")

from Linus' tree and commits:

  5304058b1526 ("dt-bindings: display: convert arm,versatile-tft-panel to DT Schema")
  c1eb28405d3a ("dt-bindings: display: convert boe,himax8279d to DT Schema")
  1aa3bf853cb4 ("dt-bindings: display: convert raydium,rm67191 to DT Schema")
  8b9e7ace123d ("dt-bindings: display: convert olimex,lcd-olinuxino to DT Schema")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index a7f3c96eb61e,ccd0ccfce4eb..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5037,14 -5019,32 +5037,14 @@@ M:	Sumit Semwal <sumit.semwal at linaro.or
  L:	linux-media at vger.kernel.org
  L:	dri-devel at lists.freedesktop.org
  L:	linaro-mm-sig at lists.linaro.org (moderated for non-subscribers)
 +S:	Maintained
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
 +F:	Documentation/driver-api/dma-buf.rst
  F:	drivers/dma-buf/
 +F:	include/linux/*fence.h
  F:	include/linux/dma-buf*
  F:	include/linux/dma-resv.h
- K:	dma_(buf|fence|resv)
 -F:	include/linux/*fence.h
 -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 at linaro.org>
 -R:	Andrew F. Davis <afd at ti.com>
 -R:	Benjamin Gaignard <benjamin.gaignard at linaro.org>
 -R:	Liam Mark <lmark at codeaurora.org>
 -R:	Laura Abbott <labbott at redhat.com>
 -R:	Brian Starkey <Brian.Starkey at arm.com>
 -R:	John Stultz <john.stultz at linaro.org>
 -S:	Maintained
 -L:	linux-media at vger.kernel.org
 -L:	dri-devel at lists.freedesktop.org
 -L:	linaro-mm-sig at 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 at kernel.org>
@@@ -5255,10 -5226,15 +5255,10 @@@ F:	drivers/gpu/drm/pl111
  
  DRM DRIVER FOR ARM VERSATILE TFT PANELS
  M:	Linus Walleij <linus.walleij at linaro.org>
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
  S:	Maintained
 -F:	drivers/gpu/drm/panel/panel-arm-versatile.c
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
- F:	Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.txt
+ F:	Documentation/devicetree/bindings/display/panel/arm,versatile-tft-panel.yaml
 -
 -DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
 -M:	Dave Airlie <airlied at redhat.com>
 -S:	Odd Fixes
 -F:	drivers/gpu/drm/ast/
 +F:	drivers/gpu/drm/panel/panel-arm-versatile.c
  
  DRM DRIVER FOR ASPEED BMC GFX
  M:	Joel Stanley <joel at jms.id.au>
@@@ -5283,8 -5254,8 +5283,8 @@@ F:	drivers/gpu/drm/bochs
  DRM DRIVER FOR BOE HIMAX8279D PANELS
  M:	Jerry Han <hanxu5 at huaqin.corp-partner.google.com>
  S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/boe,himax8279d.txt
 -F:	drivers/gpu/drm/panel/panel-boe-himax8279d.c
+ F:	Documentation/devicetree/bindings/display/panel/boe,himax8279d.yaml
 +F:	drivers/gpu/drm/panel/panel-boe-himax8279d.c
  
  DRM DRIVER FOR FARADAY TVE200 TV ENCODER
  M:	Linus Walleij <linus.walleij at linaro.org>
@@@ -5301,8 -5272,8 +5301,8 @@@ F:	drivers/gpu/drm/panel/panel-feixin-k
  DRM DRIVER FOR FEIYANG FY07024DI26A30-D MIPI-DSI LCD PANELS
  M:	Jagan Teki <jagan at amarulasolutions.com>
  S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt
 -F:	drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
+ F:	Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.yaml
 +F:	drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c
  
  DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS
  M:	Hans de Goede <hdegoede at redhat.com>
@@@ -5384,8 -5355,8 +5384,8 @@@ F:	include/uapi/drm/nouveau_drm.
  DRM DRIVER FOR OLIMEX LCD-OLINUXINO PANELS
  M:	Stefan Mavrodiev <stefan at olimex.com>
  S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
 -F:	drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+ F:	Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.yaml
 +F:	drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
  
  DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
  M:	Noralf Trønnes <noralf at tronnes.org>
@@@ -5418,12 -5395,6 +5418,12 @@@ S:	Orphan / Obsolet
  F:	drivers/gpu/drm/r128/
  F:	include/uapi/drm/r128_drm.h
  
 +DRM DRIVER FOR RAYDIUM RM67191 PANELS
 +M:	Robert Chiras <robert.chiras at nxp.com>
 +S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/raydium,rm67191.txt
++F:	Documentation/devicetree/bindings/display/panel/raydium,rm67191.yaml
 +F:	drivers/gpu/drm/panel/panel-raydium-rm67191.c
 +
  DRM DRIVER FOR ROCKTECH JH057N00900 PANELS
  M:	Guido Günther <agx at sigxcpu.org>
  R:	Purism Kernel Team <kernel at puri.sm>
@@@ -5441,18 -5412,18 +5441,18 @@@ S:	Orphan / Obsolet
  F:	drivers/gpu/drm/sis/
  F:	include/uapi/drm/sis_drm.h
  
 -DRM DRIVER FOR SITRONIX ST7701 PANELS
 -M:	Jagan Teki <jagan at 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 at lechnology.com>
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
  S:	Maintained
 -F:	drivers/gpu/drm/tiny/st7586.c
 +T:	git git://anongit.freedesktop.org/drm/drm-misc
  F:	Documentation/devicetree/bindings/display/sitronix,st7586.txt
 +F:	drivers/gpu/drm/tiny/st7586.c
 +
 +DRM DRIVER FOR SITRONIX ST7701 PANELS
 +M:	Jagan Teki <jagan at amarulasolutions.com>
 +S:	Maintained
- F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.txt
++F:	Documentation/devicetree/bindings/display/panel/sitronix,st7701.yaml
 +F:	drivers/gpu/drm/panel/panel-sitronix-st7701.c
  
  DRM DRIVER FOR SITRONIX ST7735R PANELS
  M:	David Lechner <david at lechnology.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20200416/1b63538e/attachment.sig>


More information about the Intel-gfx mailing list