• Daniel Vetter's avatar
    Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued · ca6e4405
    Daniel Vetter authored
    Backmerge fixes since it's getting out of hand again with the massive
    split due to atomic between -next and 4.2-rc. All the bugfixes in
    4.2-rc are addressed already (by converting more towards atomic
    instead of minimal duct-tape) so just always pick the version in next
    for the conflicts in modeset code.
    
    All the other conflicts are just adjacent lines changed.
    
    Conflicts:
    	drivers/gpu/drm/i915/i915_drv.h
    	drivers/gpu/drm/i915/i915_gem_gtt.c
    	drivers/gpu/drm/i915/intel_display.c
    	drivers/gpu/drm/i915/intel_drv.h
    	drivers/gpu/drm/i915/intel_ringbuffer.h
    Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
    ca6e4405
intel_ringbuffer.h 16.7 KB