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

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the drm tree with Linus' tree
Date	Mon, 24 Jul 2017 04:10:03 +0200
Message-ID	<u6AYP-6ZP-13@gated-at.bofh.it> (permalink)
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1500861966; bh=kv7iQqxaY9zVo6DOHizb9Hy0U48gZb5x+mT2WmY5Pgg=; h=Date:From:To:Cc:Subject:From; b=JnaxIKHyD1+eZC0/Ny34Po31NgsjfY9vNyUQkMX9EnADczE3Z29pFVkESo30Mk+Uy 0BGL4PiWSwrsJ3E9Ci/vAj1mSWdlBOdYy6JTQhdTIJOcvRp9Xb7dZDEQkDDJQ5wup4 yvAUaZGTXBifMS/S/dE42wO5SCRyb2rPzjROGAZ4Jebv5zxjJgppTqaiFTnWfnz03e fhPHTFHd+GDiK4PPH02aoO1AgBK2IHdZHIeOMVaSHriJ6xSB2hnEfacHh7LwjoTC1D d0xWjyeV/0VXLR5i1NWXjvB/utNRejgXz1t+HqoyXIcetOv4ie0lSKLhr2fIaPdMDk YvToHTopm5gAQ==
MIME-Version	1.0
Content-Type	text/plain; charset=UTF-8
Content-Transfer-Encoding	quoted-printable
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	60
Organization	linux.* mail to news gateway
X-Original-Cc	Linux-Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Noralf Trønnes <noralf@tronnes.org>, Randy Dunlap <rdunlap@infradead.org>, Linus Torvalds <torvalds@linux-foundation.org>
X-Original-Date	Mon, 24 Jul 2017 12:06:05 +1000
X-Original-Message-ID	<20170724120605.1044d6b2@canb.auug.org.au>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1694402

Show key headers only | View raw

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-24 04:10 +0200
  Re: linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-24 04:20 +0200

csiph-web