Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1690878
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the drm-misc tree with Linus' tree |
| Date | 2017-07-19 03:40 +0200 |
| Message-ID | <u4M81-1zI-9@gated-at.bofh.it> (permalink) |
| Organization | linux.* mail to news gateway |
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/i915_reg.h
between commit:
c379b897ba1a ("drm/i915/cnl: Fix the CURSOR_COEFF_MASK used in DDI Vswing Programming")
from Linus' tree and commit:
5a8dd2af31a7 ("drm/i915/cnl: Fix RMW on ddi vswing sequence.")
(which is also commit 33b92c1e1f27 in Linus' tree)
from the drm-misc tree.
I fixed it up (I just used the version from Linus' tree) and can carry the
fix as necessary. This is now fixed as far as linux-next is concerned,
but any non trivial conflicts should be mentioned to your upstream
maintainer when your tree is submitted for merging. You may also want
to consider cooperating with the maintainer of the conflicting tree to
minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-07-19 03:40 +0200
csiph-web