Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 17 Sep 2019 06:31:30 +0000 (16:31 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 17 Sep 2019 06:31:34 +0000 (16:31 +1000)
A couple of fixes from Thierry fixing issues as a result of the
reservation object rework in this cycle, as well as a fix from Lyude
to allow the driver to load on Thinkpad P71.

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

Trivial merge