]> www.infradead.org Git - users/willy/linux.git/commitdiff
projects / users / willy / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d434215 0b5da8d)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2016 20:14:24 +0000 (12:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2016 20:14:24 +0000 (12:14 -0800)
Pull fuse updates from Miklos Szeredi:
 "This adds SEEK_HOLE and SEEK_DATA support in lseek"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: add support for SEEK_HOLE and SEEK_DATA in lseek

1  2 
fs/fuse/file.c patch | diff1 | diff2 | blob | history

diff --cc fs/fuse/file.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.