projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 26c5eaa 0b6e9ea)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 May 2017 15:45:30 +0000 (08:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 May 2017 15:45:30 +0000 (08:45 -0700)
commita2e5ad45a9741068f357de4dbff50bb37c233e1b
tree4bf22a8a01301d5c8d10cb3dcf2397e403c37987tree | snapshot
parent26c5eaa1326e9703effd01e7cc3cc0d4ad4b3c19commit | diff
parent0b6e9ea041e6c932f5b3a86fae2d60cbcfad4dd2commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

Pull fuse updates from Miklos Szeredi:
 "Support for pid namespaces from Seth and refcount_t work from Elena"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: Add support for pid namespaces
  fuse: convert fuse_conn.count from atomic_t to refcount_t
  fuse: convert fuse_req.count from atomic_t to refcount_t
  fuse: convert fuse_file.count from atomic_t to refcount_t
fs/fuse/dev.c diff1 | diff2 | blob | history
fs/fuse/fuse_i.h diff1 | diff2 | blob | history
fs/fuse/inode.c diff1 | diff2 | blob | history
John Crispins staging tree