]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 May 2019 03:50:27 +0000 (20:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 May 2019 03:50:27 +0000 (20:50 -0700)
Pull misc vfs updates from Al Viro:
 "Assorted stuff, with no common topic whatsoever..."

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  libfs: document simple_get_link()
  Documentation/filesystems/Locking: fix ->get_link() prototype
  Documentation/filesystems/vfs.txt: document how ->i_link works
  Documentation/filesystems/vfs.txt: remove bogus "Last updated" date
  fs: use timespec64 in relatime_need_update
  fs/block_dev.c: remove unused include

1  2 
Documentation/filesystems/Locking
fs/block_dev.c
fs/inode.c
fs/libfs.c

Simple merge
diff --cc fs/block_dev.c
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/libfs.c
Simple merge