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

Stephen Rothwell
2017-07-24T02:06:17Z

Hi all,

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

MAINTAINERS

between commit:

82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")

from Linus' tree and commit:

3589211e9b03 ("drm/tinydrm: Add RePaper e-ink driver")

from the drm 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 55859cdde82a,9387e6aed3b8..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4535,6 -4531,27 +4535,12 @@@ F: include/linux/host1x.
F: include/uapi/drm/tegra_drm.h
F: Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt

-DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS
-S: Orphan / Obsolete
-F: drivers/gpu/drm/mga/
-F: include/uapi/drm/mga_drm.h
-
-DRM DRIVER FOR MGA G200 SERVER GRAPHICS CHIPS
-M: Dave Airlie <airlied@redhat.com>
-S: Odd Fixes
-F: drivers/gpu/drm/mgag200/
-
+ DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
+ M: Noralf Trønnes <noralf@tronnes.org>
+ S: Maintained
+ F: drivers/gpu/drm/tinydrm/repaper.c
+ F: Documentation/devicetree/bindings/display/repaper.txt
+
-DRM DRIVER FOR RAGE 128 VIDEO CARDS
-S: Orphan / Obsolete
-F: drivers/gpu/drm/r128/
-F: include/uapi/drm/r128_drm.h
-
DRM DRIVERS FOR RENESAS
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
L: dri-devel@lists.freedesktop.org