Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1720977

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

Show all headers | View raw

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/imx/ipuv3-plane.c

between commit:

  5be5dd38d462 ("drm/imx: ipuv3-plane: fix YUV framebuffer scanout on the base plane")

from Linus' tree and commit:

  58dff39904c0 ("drm/imx: ipuv3-plane: use fb local variable instead of state->fb")

from the drm tree.

I fixed it up (the former included the latter change) 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

Thread

linux-next: manual merge of the drm tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-08-28 04:40 +0200

csiph-web