projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e58bc92 9a87ad3)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Mar 2017 20:14:13 +0000 (12:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Mar 2017 20:14:13 +0000 (12:14 -0800)
Pull fuse update from Miklos Szeredi:
 "A bugfix and cleanups"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: release: private_data cannot be NULL
  fuse: cleanup fuse_file refcounting
  fuse: add missing FR_FORCE

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

diff --cc fs/fuse/dir.c
Simple merge
diff --cc fs/fuse/file.c
Simple merge
diff --cc fs/fuse/fuse_i.h
Simple merge
John Crispins staging tree