From: Dave Airlie Date: Tue, 8 Sep 2020 21:46:32 +0000 (+1000) Subject: Backmerge drm-fixes merge into drm-next X-Git-Tag: microblaze-v5.11~41^2~29 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=61d98185b41c5ddc442fcfef7dd5a7b289ef69f5;p=linux-2.6-microblaze.git Backmerge drm-fixes merge into drm-next Commit '6f6a73c8b715d595977774d48450a734297ab21f' from Linus' tree The fixes reverts cause a bit of a conflict pain with intel next, start fixing it up here. Signed-off-by: Dave Airlie --- 61d98185b41c5ddc442fcfef7dd5a7b289ef69f5