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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date	2015-09-24 03:30 +0200
Message-ID	<qc3wd-4Ws-1@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

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 commit:

  721a09f7393d ("drm/i915: Add primary plane to mask if it's visible")

from the drm-intel-fixes tree and commit:

  f9cd7b881a04 ("drm/i915: Move sprite/cursor plane disable to intel_sanitize_crtc()")

from the drm-intel tree.

I fixed it up (I have no idea what do to here, so I just used the version
from the drm-intel tree) and can carry the fix as necessary (no action
is required - unless there is a better fix).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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> - 2015-09-24 03:30 +0200
  Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Jani Nikula <jani.nikula@linux.intel.com> - 2015-09-24 11:00 +0200
    Re: linux-next: manual merge of the drm-intel tree with the  drm-intel-fixes tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-24 14:00 +0200

csiph-web