From: James Morris <james.morris@microsoft.com>
Date: Thu, 22 Mar 2018 21:26:16 +0000 (+1100)
Subject: Merge tag 'v4.16-rc6' into next-general
X-Git-Tag: ceph-for-4.17-rc2~86^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5893ed18a26d1f56b97c0290b0cbbc2d49d6de28;p=ceph-client.git

Merge tag 'v4.16-rc6' into next-general

Merge to Linux 4.16-rc6 at the request of Jarkko, for his TPM updates.
---

5893ed18a26d1f56b97c0290b0cbbc2d49d6de28