Merge branch 'linux-5.14' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 19 Aug 2021 20:57:44 +0000 (06:57 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 19 Aug 2021 23:18:14 +0000 (09:18 +1000)
commitb88aefc51ce92e74dae10b67f5886d29ba4590d4
tree7b787e0c37e0d918e7c2a2d44fc4ba081620efda
parente213bd1e72f06529178d41af93fde0523b2b6f46
parent59f216cf04d973b4316761cbf3e7cb9556715b7a
Merge branch 'linux-5.14' of git://github.com/skeggsb/linux into drm-fixes

- Ampere display fixes
- Fix longstanding MM race issue by removing unused code.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5jtUFkHsGe-pf-=RceDOgKygjPnCi=6d5vCLM_f5aeMQ@mail.gmail.com