]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitbee4e74bee45cfb830f55509791e5a47ed546f94
tree4bf22a8a01301d5c8d10cb3dcf2397e403c37987
parent87403c5bd34a4fe3307dc3712e6c73c2223e5b6e
parent040d3337bef96501e9d27eecdbe00af1366a8b7a
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
fs/fuse/fuse_i.h
fs/fuse/inode.c