From: Dave Airlie <airlied@redhat.com>
Date: Tue, 17 Sep 2019 06:31:30 +0000 (+1000)
Subject: Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next
X-Git-Tag: v5.4-rc1~32^2~2
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=945b584c94f8c665b2df3834a8a6a8faf256cd5f;p=sfrench%2Fcifs-2.6.git

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

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

945b584c94f8c665b2df3834a8a6a8faf256cd5f