Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1208338 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-08-17 05:30 +0200 |
| Last post | 2015-08-17 05:30 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-17 05:30 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-08-17 05:30 +0200 |
| Subject | linux-next: manual merge of the drm tree with the drm-intel-fixes tree |
| Message-ID | <pYjhw-3w8-17@gated-at.bofh.it> |
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_display.c
between commits:
f0fdc55db0c6 ("drm/i915: calculate primary visibility changes instead of calling from set_config")
d2944cf21305 ("drm/i915: Commit planes on each crtc separately.")
from the drm-intel-fixes tree and commit:
74c090b1bdc5 ("drm/i915: Use full atomic modeset.")
and maybe others from the drm tree.
I fixed it up (both these former commits are based on commits in the
latter tree, so I just used the latter tree versions) 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 top | Article view | linux.kernel
csiph-web