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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics <intel-gfx@lists.freedesktop.org>,
	DRI <dri-devel@lists.freedesktop.org>
Cc: Neil Armstrong <neil.armstrong@linaro.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Artur Weber <aweber.kernel@gmail.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Tue, 23 May 2023 10:43:24 +1000	[thread overview]
Message-ID: <20230523104324.602c426a@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 2200 bytes --]

Hi all,

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

  MAINTAINERS

between commit:

  80e62bc8487b ("MAINTAINERS: re-sort all entries and fields")

from Linus' tree and commit:

  0dd53308f74f ("MAINTAINERS: Add entry for Samsung S6D7AA0 LCD panel controller driver")

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 8e18bbafa740,7cc2bfa4af6f..000000000000

--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6700,6 -6663,35 +6700,12 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/display/panel/samsung,s6d27a1.yaml
  F:	drivers/gpu/drm/panel/panel-samsung-s6d27a1.c
  
+ DRM DRIVER FOR SAMSUNG S6D7AA0 PANELS
+ M:	Artur Weber <aweber.kernel@gmail.com>
+ S:	Maintained
+ F:	Documentation/devicetree/bindings/display/panel/samsung,s6d7aa0.yaml
+ F:	drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c
+ 
 -DRM DRIVER FOR SITRONIX ST7703 PANELS
 -M:	Guido Günther <agx@sigxcpu.org>
 -R:	Purism Kernel Team <kernel@puri.sm>
 -R:	Ondrej Jirman <megous@megous.com>
 -S:	Maintained
 -F:	Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
 -F:	drivers/gpu/drm/panel/panel-sitronix-st7703.c
 -
 -DRM DRIVER FOR FIRMWARE FRAMEBUFFERS
 -M:	Thomas Zimmermann <tzimmermann@suse.de>
 -M:	Javier Martinez Canillas <javierm@redhat.com>
 -L:	dri-devel@lists.freedesktop.org
 -S:	Maintained
 -T:	git git://anongit.freedesktop.org/drm/drm-misc
 -F:	drivers/gpu/drm/drm_aperture.c
 -F:	drivers/gpu/drm/tiny/ofdrm.c
 -F:	drivers/gpu/drm/tiny/simpledrm.c
 -F:	drivers/video/aperture.c
 -F:	drivers/video/nomodeset.c
 -F:	include/drm/drm_aperture.h
 -F:	include/linux/aperture.h
 -F:	include/video/nomodeset.h
 -
  DRM DRIVER FOR SITRONIX ST7586 PANELS
  M:	David Lechner <david@lechnology.com>
  S:	Maintained

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
