projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 227701e 040d786)
Merge tag 'ceph-for-4.15-rc4' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Dec 2017 20:48:27 +0000 (12:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Dec 2017 20:48:27 +0000 (12:48 -0800)
commitdd3d66b8381a33f6d992e5890883e1d9fc8721af
tree3bce1df52836b63e3b0b53d31f1207e9fd9f51f3tree | snapshot
parent227701e0e7078065f24f5a6ca220218fd80023a5commit | diff
parent040d786032bf59002d374b86d75b04d97624005ccommit | diff
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
Domain: System / Kernel;