From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jun 2021 02:19:47 +0000 (+1000)
Subject: Merge remote-tracking branch 'drm/drm-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=302f3adf3371986ff15b674264a8ff542262ce34;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'drm/drm-next'

# Conflicts:
#	drivers/gpu/drm/i915/selftests/i915_gem.c
---

302f3adf3371986ff15b674264a8ff542262ce34