diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 08:45:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 08:45:30 -0700 |
| commit | a2e5ad45a9741068f357de4dbff50bb37c233e1b (patch) | |
| tree | 4bf22a8a01301d5c8d10cb3dcf2397e403c37987 /kernel/bpf/arraymap.c | |
| parent | Merge tag 'ceph-for-4.12-rc1' of git://github.com/ceph/ceph-client (diff) | |
| parent | fuse: Add support for pid namespaces (diff) | |
| download | linux-dev-a2e5ad45a9741068f357de4dbff50bb37c233e1b.tar.xz linux-dev-a2e5ad45a9741068f357de4dbff50bb37c233e1b.zip | |
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
Diffstat (limited to 'kernel/bpf/arraymap.c')
0 files changed, 0 insertions, 0 deletions