Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1283089
| From | Mark Brown <broonie@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the drm tree with the tree |
| Date | 2015-12-03 15:50 +0100 |
| Message-ID | <qBDmN-6pd-1@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
[Multipart message — attachments visible in raw view] - view raw
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_runtime_pm.c between commit
ac9b8236551d11 ("drm/i915: Introduce a gmbus power domain") from the
drm-intel-fixes tree and commit 73dfc227ff5c8e005 ("drm/i915/skl: init/uninit
display core as part of the HW power domain state") from the drm tree. It
also seems like the gmbus power domain commit has been added in both trees.
I fixed it up (resulting in an empty diff) and can carry the fix as necessary
(no action is required).
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
linux-next: manual merge of the drm tree with the tree Mark Brown <broonie@kernel.org> - 2015-12-03 15:50 +0100
csiph-web