]> 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)
commit4790a5581721a58617aaa928f7cd2c3d6592145f
tree4bf22a8a01301d5c8d10cb3dcf2397e403c37987
parentffdb3b525ddb68fb3075a1d1336da39f73fafd44
parent653e9d14ec27620c5ed7bd9f95dde72c232536fb
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