diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 01:23:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-18 01:23:02 +0200 |
commit | 6e203506599bdd1e73f4850d94ccc762980fd9cd (patch) | |
tree | e020dea6c506643f3f3e2df24ef188a2e4804fce /drivers | |
parent | Merge tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
parent | ceph: unify inode i_ctime update (diff) | |
download | linux-6e203506599bdd1e73f4850d94ccc762980fd9cd.tar.xz linux-6e203506599bdd1e73f4850d94ccc762980fd9cd.zip |
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
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions