Messages in this thread | | | Date | Sun, 1 Nov 2015 19:11:30 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm tree with Linus' tree |
| |
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c drivers/gpu/drm/amd/amdgpu/dce_v11_0.c drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
between commit:
f6c7aba47bcc ("drm/amdgpu: Keep the pflip interrupts always enabled v7")
from Linus' tree and commit:
f9fff064bb83 ("drm/amdgpu/dce: simplify suspend/resume")
from the drm tree.
I fixed it up (I just used the versions from the drm tree) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |