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 s...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
