linux-next: manual merge of the drm-misc tree with the drm 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>,
	Dave Airlie <airlied@linux•ie>
Cc: "Alex Deucher" <alexander.deucher@amd•com>,
	"Linux Next Mailing List" <linux-next@vger•kernel.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
	"Thomas Zimmermann" <tzimmermann@suse•de>,
	"Christian König" <christian.koenig@amd•com>
Subject: linux-next: manual merge of the drm-misc tree with the drm tree
Date: Fri, 23 Nov 2018 11:13:09 +1100	[thread overview]
Message-ID: <20181123111309.74882d70@canb.auug.org.au> (raw)


[-- Attachment #1.1: Type: text/plain, Size: 1368 bytes --]

Hi all,

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

  drivers/gpu/drm/Makefile

between commit:

  2bb42410b1bd ("drm: Remove drm_global.{c,h} v2")

from the drm tree and commit:

  c6fdea6e1a19 ("drm: Merge drm_info.c into drm_debugfs.c")

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 drivers/gpu/drm/Makefile
index 7f3be3506057,7c88f12096c5..000000000000

--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@@ -10,8 -10,8 +10,8 @@@ drm-y       :=	drm_auth.o drm_bufs.o dr
  		drm_scatter.o drm_pci.o \
  		drm_sysfs.o drm_hashtab.o drm_mm.o \
  		drm_crtc.o drm_fourcc.o drm_modes.o drm_edid.o \
- 		drm_info.o drm_encoder_slave.o \
+ 		drm_encoder_slave.o \
 -		drm_trace_points.o drm_global.o drm_prime.o \
 +		drm_trace_points.o drm_prime.o \
  		drm_rect.o drm_vma_manager.o drm_flip_work.o \
  		drm_modeset_lock.o drm_atomic.o drm_bridge.o \
  		drm_framebuffer.o drm_connector.o drm_blend.o \

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

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists•freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
