From: Dave Airlie <airlied@redhat.com>
Date: Mon, 25 Jan 2021 04:35:44 +0000 (+1000)
Subject: Merge tag 'v5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bc96ad6722f86a377ed2872c9a4854c90caf78ca;p=linux.git

Merge tag 'v5.11-rc5' of git://git./linux/kernel/git/torvalds/linux into drm-next

Backmerge v5.11-rc5 into drm-next to clean up a bunch of conflicts we are dragging around.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

bc96ad6722f86a377ed2872c9a4854c90caf78ca