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

From: Stephen Rothwell
Date: Sun Nov 01 2015 - 03:11:42 EST

Hi Dave,

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


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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at