Merge branch 'linux-5.12' of git://github.com/skeggsb/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 1 Feb 2021 06:13:29 +0000 (16:13 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 1 Feb 2021 06:13:32 +0000 (16:13 +1000)
commitaf2922fa158eccf0b1534bad5375cee62a622a4a
treebbd0f0249c93a94a6db2f8372abec391419ef15e
parent32c3d9b0f51ee1e6bb0160496b97e50b5caca4d0
parentd1f5a3fc85566e9ddce9361ef180f070367e6eab
Merge branch 'linux-5.12' of git://github.com/skeggsb/linux into drm-next

Nothing too major here, I actually thought I'd sent most of these
right before the new year, but that apparently got lost in the bustle:
- Turing MMU fault recovery fixes
- Fix mDP connectors being reported as eDP to userspace
- Fixes for audio locking, and other bit-rot from DRM changes since
atomic support was written
- Misc other minor fixes.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7yLfhuVbYa-4g0vxVt93OaC7Sodiz2R-TDHu-MoofEdw@mail.gmail.com