From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 4 Jan 2019 11:07:47 +0000 (+1100)
Subject: Merge branch 'master' into fixes
X-Git-Tag: ceph-for-5.0-rc2~34^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d538d94f0ca86cfedc892cc427169219acb3c2f7;p=ceph-client.git

Merge branch 'master' into fixes

We have a fix to apply on top of commit 96d4f267e40f ("Remove 'type'
argument from access_ok() function"), so merge master to get it.
---

d538d94f0ca86cfedc892cc427169219acb3c2f7