From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Jun 2017 23:23:02 +0000 (+0900)
Subject: Merge tag 'ceph-for-4.12-rc6' of git://github.com/ceph/ceph-client
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e203506599bdd1e73f4850d94ccc762980fd9cd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'ceph-for-4.12-rc6' of git://github.com/ceph/ceph-client

Pull ceph fixes from Ilya Dryomov:
 "A fix for an old ceph ->fh_to_* bug from Luis and two timestamp fixups
  from Zheng, prompted by the ongoing y2038 work"

* tag 'ceph-for-4.12-rc6' of git://github.com/ceph/ceph-client:
  ceph: unify inode i_ctime update
  ceph: use current_kernel_time() to get request time stamp
  ceph: check i_nlink while converting a file handle to dentry
---

6e203506599bdd1e73f4850d94ccc762980fd9cd