From: Dave Airlie <airlied@redhat.com>
Date: Thu, 19 Aug 2021 20:57:44 +0000 (+1000)
Subject: Merge branch 'linux-5.14' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: microblaze-v5.16~266^2~3
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=b88aefc51ce92e74dae10b67f5886d29ba4590d4;p=linux-2.6-microblaze.git

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
---

b88aefc51ce92e74dae10b67f5886d29ba4590d4