From: Dave Airlie Date: Thu, 7 Nov 2013 02:22:10 +0000 (+1000) Subject: Merge branch 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux into... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=212c444baa4efe0077fb2a07a65ccb3011b94e8f;p=linux-beck.git Merge branch 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux into drm-next - A couple of fixes that never made it into fixes-3.12 - Make NO_EVICT bo's available for shrinkers when on delayed-delete list - Allow retrying page-faults that need to wait for GPU. * 'ttm-next-3.13' of git://people.freedesktop.org/~thomash/linux: drm/ttm: Fix memory type compatibility check drm/ttm: Fix ttm_bo_move_memcpy drm/ttm: Handle in-memory region copies drm/ttm: Make NO_EVICT bos available to shrinkers pending destruction drm/ttm: Allow vm fault retries --- 212c444baa4efe0077fb2a07a65ccb3011b94e8f