projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5615f9f f2b3455)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2014 15:57:17 +0000 (08:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Jul 2014 15:57:17 +0000 (08:57 -0700)
Pull fuse fixes from Miklos Szeredi:
 "This contains miscellaneous fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: replace count*size kzalloc by kcalloc
  fuse: release temporary page if fuse_writepage_locked() failed
  fuse: restructure ->rename2()
  fuse: avoid scheduling while atomic
  fuse: handle large user and group ID
  fuse: inode: drop cast
  fuse: ignore entry-timeout on LOOKUP_REVAL
  fuse: timeout comparison fix

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

diff --cc fs/fuse/dev.c
Simple merge
diff --cc fs/fuse/file.c
Simple merge
Domain: System / Kernel;