Merge branch 'linux-5.11' of git://github.com/skeggsb/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Sun, 15 Nov 2020 21:25:46 +0000 (07:25 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 15 Nov 2020 21:25:46 +0000 (07:25 +1000)
-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
1  2 
drivers/gpu/drm/nouveau/nouveau_bo.c

Simple merge