From: Rodrigo Vivi Date: Fri, 30 Mar 2018 18:52:33 +0000 (-0700) Subject: Merge airlied/drm-next into drm-intel-next-queued X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1f901d59a5489e4dc7fdd339808d89b89f35483e;p=linux.git Merge airlied/drm-next into drm-intel-next-queued Commit 'aee3bac0a3a8 ("drm/i915/psr: Tie PSR2 support to Y coordinate requirement")' got merged to drm-intel-next-queued but the variable was defined commit 'c5fe47327b06 ("drm: Add PSR version 3 macro") who was merged through drm-misc. So backmerging to get drm-intel-next-queued compiling back again. Signed-off-by: Rodrigo Vivi --- 1f901d59a5489e4dc7fdd339808d89b89f35483e