linux-kernel - linux-next: manual merge of the drm-misc tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20200415114620.0657d62c@canb.auug.org.au>
Date:   Wed, 15 Apr 2020 11:46:20 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Joe Perches <joe@...ches.com>,
        Jagan Teki <jagan@...rulasolutions.com>,
        Sam Ravnborg <sam@...nborg.org>
Subject: linux-next: manual merge of the drm-misc tree with Linus' tree

Hi all,

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

  MAINTAINERS

between commitis:

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

from Linus' tree and commits:

  8edb69970739 ("MAINTAINERS: Better regex for dma_buf|fence|resv")
  7fd9681e8fd0 ("MAINTAINERS: Update feiyang,st7701 panel bindings converted as YAML")

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 c3cd17dbcb88,50b068f3580a..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -5037,14 -5019,32 +5037,14 @@@ M:	Sumit Semwal <sumit.semwal@...aro.or
  L:	linux-media@...r.kernel.org
  L:	dri-devel@...ts.freedesktop.org
  L:	linaro-mm-sig@...ts.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@...aro.org>
 -R:	Andrew F. Davis <afd@...com>
 -R:	Benjamin Gaignard <benjamin.gaignard@...aro.org>
 -R:	Liam Mark <lmark@...eaurora.org>
 -R:	Laura Abbott <labbott@...hat.com>
 -R:	Brian Starkey <Brian.Starkey@....com>
 -R:	John Stultz <john.stultz@...aro.org>
 -S:	Maintained
 -L:	linux-media@...r.kernel.org
 -L:	dri-devel@...ts.freedesktop.org
 -L:	linaro-mm-sig@...ts.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@...nel.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@...rulasolutions.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@...hat.com>
@@@ -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@...rulasolutions.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@...hnology.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@...rulasolutions.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@...hnology.com>

Content of type "application/pgp-signature" skipped