From: Michael Ellerman <mpe@ellerman.id.au>
Date: Thu, 29 Aug 2019 23:49:28 +0000 (+1000)
Subject: Merge branch 'topic/mem-encrypt' into next
X-Git-Tag: ceph-for-5.4-rc4~168^2~135
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=07aa1e786d4fc93cf646797ce045510dd5e982ee;p=ceph-client.git

Merge branch 'topic/mem-encrypt' into next

This branch has some cross-arch patches that are a prequisite for the
SVM work. They're in a topic branch in case any of the other arch
maintainers want to merge them to resolve conflicts.
---

07aa1e786d4fc93cf646797ce045510dd5e982ee