Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1234626 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-09-29 03:30 +0200 |
| Last post | 2015-09-29 03:30 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-29 03:30 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-09-29 03:30 +0200 |
| Subject | linux-next: manual merge of the drm-misc tree with the drm-intel tree |
| Message-ID | <qdRTX-8pF-1@gated-at.bofh.it> |
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/intel_audio.c
between commit:
b8abe859c9d6 ("drm/i915: Always call the adjusted mode 'adjusted_mode'")
from the drm-intel tree and commit:
9e5a3b529e84 ("drm: Remove the 'mode' argument from drm_select_eld()")
from the drm-misc tree.
I fixed it up (I used the drm-misc 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 top | Article view | linux.kernel
csiph-web