From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Dec 2017 20:48:27 +0000 (-0800)
Subject: Merge tag 'ceph-for-4.15-rc4' of git://github.com/ceph/ceph-client
X-Git-Tag: v4.15-rc4~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd3d66b8381a33f6d992e5890883e1d9fc8721af;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'ceph-for-4.15-rc4' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
 "CephFS inode trimming fix from Zheng, marked for stable"

* tag 'ceph-for-4.15-rc4' of git://github.com/ceph/ceph-client:
  ceph: drop negative child dentries before try pruning inode's alias
---

dd3d66b8381a33f6d992e5890883e1d9fc8721af