Merge branch 'imm.timestamp' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Feb 2020 05:02:42 +0000 (05:02 +0000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Feb 2020 05:02:42 +0000 (05:02 +0000)
Pull vfs timestamp updates from Al Viro:
 "More 64bit timestamp work"

* 'imm.timestamp' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  kernfs: don't bother with timestamp truncation
  fs: Do not overload update_time
  fs: Delete timespec64_trunc()
  fs: ubifs: Eliminate timespec64_trunc() usage
  fs: ceph: Delete timespec64_trunc() usage
  fs: cifs: Delete usage of timespec64_trunc
  fs: fat: Eliminate timespec64_trunc() usage
  utimes: Clamp the timestamps in notify_change()

1  2 
fs/ceph/mds_client.c
fs/cifs/inode.c
fs/f2fs/file.c
fs/inode.c
fs/ubifs/file.c
fs/ubifs/sb.c
include/linux/fs.h

Simple merge
diff --cc fs/cifs/inode.c
Simple merge
diff --cc fs/f2fs/file.c
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/ubifs/file.c
Simple merge
diff --cc fs/ubifs/sb.c
Simple merge
Simple merge