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

From: Stephen Rothwell
Date: Sun Jul 23 2017 - 22:10:13 EST

Next message: kernel test robot: "[lkp-robot] [mm/vmalloc] 3fef5b604a: kernel_BUG_at_mm/vmalloc.c"
Previous message: kernel test robot: "[lkp-robot] [mm/vmalloc] dec0553d31: WARNING:at_mm/vmalloc.c:#vmap_page_range_noflush"
In reply to: Stephen Rothwell: "linux-next: manual merge of the drm tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi all,

On Mon, 24 Jul 2017 12:06:05 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.

I did the resolution again after running Linus' script ...

--
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 55859cdde82a,9387e6aed3b8..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4306,130 -4349,68 +4306,136 @@@ T: git git://anongit.freedesktop.org/dr
S: Maintained
F: drivers/gpu/drm/bochs/

-DRM DRIVER FOR QEMU'S CIRRUS DEVICE
+DRM DRIVER FOR INTEL I810 VIDEO CARDS
+S: Orphan / Obsolete
+F: drivers/gpu/drm/i810/
+F: include/uapi/drm/i810_drm.h
+
+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@xxxxxxxxxx>
-M: Gerd Hoffmann <kraxel@xxxxxxxxxx>
-L: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
-T: git git://anongit.freedesktop.org/drm/drm-misc
-S: Obsolete
-W: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
-F: drivers/gpu/drm/cirrus/
+S: Odd Fixes
+F: drivers/gpu/drm/mgag200/

-RADEON and AMDGPU DRM DRIVERS
-M: Alex Deucher <alexander.deucher@xxxxxxx>
-M: Christian KÃnig <christian.koenig@xxxxxxx>
-L: amd-gfx@xxxxxxxxxxxxxxxxxxxxx
-T: git git://people.freedesktop.org/~agd5f/linux
-S: Supported
-F: drivers/gpu/drm/radeon/
-F: include/uapi/drm/radeon_drm.h
-F: drivers/gpu/drm/amd/
-F: include/uapi/drm/amdgpu_drm.h
+DRM DRIVER FOR MI0283QT
+M: Noralf TrÃnnes <noralf@xxxxxxxxxxx>
+S: Maintained
+F: drivers/gpu/drm/tinydrm/mi0283qt.c
+F: Documentation/devicetree/bindings/display/multi-inno,mi0283qt.txt

-DRM PANEL DRIVERS
-M: Thierry Reding <thierry.reding@xxxxxxxxx>
+DRM DRIVER FOR MSM ADRENO GPU
+M: Rob Clark <robdclark@xxxxxxxxx>
+L: linux-arm-msm@xxxxxxxxxxxxxxx
L: dri-devel@xxxxxxxxxxxxxxxxxxxxx
-T: git git://anongit.freedesktop.org/tegra/linux.git
+L: freedreno@xxxxxxxxxxxxxxxxxxxxx
+T: git git://people.freedesktop.org/~robclark/linux
S: Maintained
-F: drivers/gpu/drm/drm_panel.c
-F: drivers/gpu/drm/panel/
-F: include/drm/drm_panel.h
-F: Documentation/devicetree/bindings/display/panel/
+F: drivers/gpu/drm/msm/
+F: include/uapi/drm/msm_drm.h
+F: Documentation/devicetree/bindings/display/msm/

-INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
-M: Daniel Vetter <daniel.vetter@xxxxxxxxx>
-M: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
-L: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
-W: https://01.org/linuxgraphics/
-B: https://01.org/linuxgraphics/documentation/how-report-bugs
-C: irc://chat.freenode.net/intel-gfx
-Q: http://patchwork.freedesktop.org/project/intel-gfx/
-T: git git://anongit.freedesktop.org/drm-intel
+DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
+M: Ben Skeggs <bskeggs@xxxxxxxxxx>
+L: dri-devel@xxxxxxxxxxxxxxxxxxxxx
+L: nouveau@xxxxxxxxxxxxxxxxxxxxx
+T: git git://github.com/skeggsb/linux
S: Supported
-F: drivers/gpu/drm/i915/
-F: include/drm/i915*
-F: include/uapi/drm/i915_drm.h
-F: Documentation/gpu/i915.rst
+F: drivers/gpu/drm/nouveau/
+F: include/uapi/drm/nouveau_drm.h

-INTEL GVT-g DRIVERS (Intel GPU Virtualization)
-M: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
-M: Zhi Wang <zhi.a.wang@xxxxxxxxx>
-L: intel-gvt-dev@xxxxxxxxxxxxxxxxxxxxx
-L: intel-gfx@xxxxxxxxxxxxxxxxxxxxx
-W: https://01.org/igvt-g
-T: git https://github.com/01org/gvt-linux.git
-S: Supported
-F: drivers/gpu/drm/i915/gvt/
++DRM DRIVER FOR PERVASIVE DISPLAYS REPAPER PANELS
++M: Noralf TrÃnnes <noralf@xxxxxxxxxxx>
++S: Maintained
++F: drivers/gpu/drm/tinydrm/repaper.c
++F: Documentation/devicetree/bindings/display/repaper.txt
+
-DRM DRIVERS FOR ATMEL HLCDC
-M: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>
+DRM DRIVER FOR QEMU'S CIRRUS DEVICE
+M: Dave Airlie <airlied@xxxxxxxxxx>
+M: Gerd Hoffmann <kraxel@xxxxxxxxxx>
+L: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
+T: git git://anongit.freedesktop.org/drm/drm-misc
+S: Obsolete
+W: https://www.kraxel.org/blog/2014/10/qemu-using-cirrus-considered-harmful/
+F: drivers/gpu/drm/cirrus/
+
+DRM DRIVER FOR QXL VIRTUAL GPU
+M: Dave Airlie <airlied@xxxxxxxxxx>
+M: Gerd Hoffmann <kraxel@xxxxxxxxxx>
+L: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
+T: git git://anongit.freedesktop.org/drm/drm-misc
+S: Maintained
+F: drivers/gpu/drm/qxl/
+F: include/uapi/drm/qxl_drm.h
+
+DRM DRIVER FOR RAGE 128 VIDEO CARDS
+S: Orphan / Obsolete
+F: drivers/gpu/drm/r128/
+F: include/uapi/drm/r128_drm.h
+
+DRM DRIVER FOR SAVAGE VIDEO CARDS
+S: Orphan / Obsolete
+F: drivers/gpu/drm/savage/
+F: include/uapi/drm/savage_drm.h
+
+DRM DRIVER FOR SIS VIDEO CARDS
+S: Orphan / Obsolete
+F: drivers/gpu/drm/sis/
+F: include/uapi/drm/sis_drm.h
+
+DRM DRIVER FOR TDFX VIDEO CARDS
+S: Orphan / Obsolete
+F: drivers/gpu/drm/tdfx/
+
+DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS
+M: Dave Airlie <airlied@xxxxxxxxxx>
+S: Odd Fixes
+F: drivers/gpu/drm/udl/
+
+DRM DRIVER FOR VMWARE VIRTUAL GPU
+M: "VMware Graphics" <linux-graphics-maintainer@xxxxxxxxxx>
+M: Sinclair Yeh <syeh@xxxxxxxxxx>
+M: Thomas Hellstrom <thellstrom@xxxxxxxxxx>
L: dri-devel@xxxxxxxxxxxxxxxxxxxxx
+T: git git://people.freedesktop.org/~syeh/repos_linux
+T: git git://people.freedesktop.org/~thomash/linux
S: Supported
-F: drivers/gpu/drm/atmel-hlcdc/
-F: Documentation/devicetree/bindings/drm/atmel/
+F: drivers/gpu/drm/vmwgfx/
+F: include/uapi/drm/vmwgfx_drm.h
+
+DRM DRIVERS
+M: David Airlie <airlied@xxxxxxxx>
+L: dri-devel@xxxxxxxxxxxxxxxxxxxxx
+T: git git://people.freedesktop.org/~airlied/linux
+B: https://bugs.freedesktop.org/
+C: irc://chat.freenode.net/dri-devel
+S: Maintained
+F: drivers/gpu/drm/
+F: drivers/gpu/vga/
+F: Documentation/devicetree/bindings/display/
+F: Documentation/devicetree/bindings/gpu/
+F: Documentation/devicetree/bindings/video/
+F: Documentation/gpu/
+F: include/drm/
+F: include/uapi/drm/
+F: include/linux/vga*
+
+DRM DRIVERS AND MISC GPU PATCHES
+M: Daniel Vetter <daniel.vetter@xxxxxxxxx>
+M: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
+M: Sean Paul <seanpaul@xxxxxxxxxxxx>
+W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
+S: Maintained
T: git git://anongit.freedesktop.org/drm/drm-misc
+F: Documentation/gpu/
+F: drivers/gpu/vga/
+F: drivers/gpu/drm/*
+F: include/drm/drm*
+F: include/uapi/drm/drm*
+F: include/linux/vga*

DRM DRIVERS FOR ALLWINNER A10
M: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>

Next message: kernel test robot: "[lkp-robot] [mm/vmalloc] 3fef5b604a: kernel_BUG_at_mm/vmalloc.c"
Previous message: kernel test robot: "[lkp-robot] [mm/vmalloc] dec0553d31: WARNING:at_mm/vmalloc.c:#vmap_page_range_noflush"
In reply to: Stephen Rothwell: "linux-next: manual merge of the drm tree with Linus' tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]