Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1469019

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

Show all headers | View raw

Hi all,

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

  drivers/gpu/drm/i915/intel_display.c

between commits from the drm-intel-fixes tree (some of which are
cherry-picked from the drm-intel tree) and teh same and other commits
from the drm-inte tree.  These are just going to cause new conflicts
every time you touch this file again in either tree (which happens a
lot :-().

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 only putting
the fix patches into the drm-intel-fixes tree and then getting them
into the drm-intel tree by merging the -fixes tree instead of
cherry-picking them the other way.

-- 
Cheers,
Stephen Rothwell

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

Thread

linux-next: manual merge of the drm-intel tree with the  drm-intel-fixes tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-08-24 03:50 +0200
  Re: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Jani Nikula <jani.nikula@linux.intel.com> - 2016-08-24 15:40 +0200

csiph-web