Hi Dave, Today's linux-next merge of the drm tree got a conflict in drivers/gpu/drm/i915/i915_gem_render_state.c between commit 88b982873567 ("drm/i915: fix freeze with blank screen booting highmem") from the drm-intel-fixes tree and commit 1ce826d436f3 ("drm/i915: Simplify processing of the golden render context state") from the drm tree. I fixed it up (the latter appears to supercede the former, so I used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature