Merge branch 'drm-radeon-lockup' into drm-core-next