From: Linus Torvalds Date: Thu, 26 Mar 2015 22:04:05 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4.0.0-rc5-00096-g3c435c1;p=deliverable%2Flinux.git Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Pull drm refcounting fixes from Dave Airlie: "Here is the complete set of i915 bug/warn/refcounting fixes" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/i915: Fixup legacy plane->crtc link for initial fb config drm/i915: Fix atomic state when reusing the firmware fb drm/i915: Keep ring->active_list and ring->requests_list consistent drm/i915: Don't try to reference the fb in get_initial_plane_config() drm: Fixup racy refcounting in plane_force_disable --- 3c435c1e472ba344ee25f795f4807d4457e61f6c