From: Dave Airlie <airlied@redhat.com>
Date: Sun, 15 Nov 2020 21:25:46 +0000 (+1000)
Subject: Merge branch 'linux-5.11' of git://github.com/skeggsb/linux into drm-next
X-Git-Tag: io_uring-5.11-2020-12-23~116^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=31b05212360cbf3af3c2e1b7f42e176e0eebedb5;p=linux-block.git

Merge branch 'linux-5.11' of git://github.com/skeggsb/linux into drm-next

-next fix for type stuff.

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5vuM54oU1Yp8sX5ZVmJAv+-oQRQj-AeaKFb3qs1EtP-g@mail.gmail.com
---

31b05212360cbf3af3c2e1b7f42e176e0eebedb5