Merge tag 'drm-misc-fixes-2021-05-27' of ssh://git.freedesktop.org/git/drm/drm-misc...
authorDave Airlie <airlied@redhat.com>
Fri, 28 May 2021 03:24:25 +0000 (13:24 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 28 May 2021 03:24:42 +0000 (13:24 +1000)
commitb26389e854f7c2f28e8ea754d169834f1fe7e620
treef0756be37baff3ecd200d9057228cbf3a5fef52f
parentac6e9e3d19e4fd14e1e6b9a5d65c5a847f3dff02
parent35f819d218035ddfbc71e7cf62a4849231701e58
Merge tag 'drm-misc-fixes-2021-05-27' of ssh://git.freedesktop.org/git/drm/drm-misc into drm-fixes

A fix in meson for a crash at shutdown and one for TTM to prevent
irrelevant swapout

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210527120828.3w7f53krzkslc4ii@gilmour