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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the drm-intel tree with Linus' tree
Date	2015-09-29 03:30 +0200
Message-ID	<qdRTY-8pF-7@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 Linus' tree and commit:

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

from the drm-intel tree.

I fixed it up (I used the drm-intel tree version) and can carry the fix
as necessary (no action is required).

-- 
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 | Find similar | Unroll thread

Thread

linux-next: manual merge of the drm-intel tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-29 03:30 +0200

csiph-web