diff mbox series

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

Message ID 20210118115625.0dae1d02@canb.auug.org.au (mailing list archive)
State New, archived
Headers show
Series linux-next: manual merge of the drm tree with Linus' tree | expand

Commit Message

Stephen Rothwell Jan. 18, 2021, 12:56 a.m. UTC
Hi all,

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


between commits:

  3c517ca5212f ("Revert "drm/amdgpu/disply: fix documentation warnings in display manager"")
  a7ddd22151fc ("Revert "drm/amd/display: Expose new CRC window property"")

from Linus' tree and commit:

  71338cb4a7c2 ("drm/amd/display: enable idle optimizations for linux (MALL stutter)")

from the drm tree.

I fixed it up (see below) 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.
diff mbox series


diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index 1182dafcef02,f084e2fc9569..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h