diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-15 16:09:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-15 16:09:50 -0800 |
| commit | 99421c1cb27fb837e93b517036fab4500fe39de5 (patch) | |
| tree | de5fc5bacb671223f389793ad643cebe520bc292 /net/batman-adv/main.h | |
| parent | c92816275674c1491ce228ee49aa030a5fa1be04 (diff) | |
| parent | 93362fa47fe98b62e4a34ab408c4a418432e7939 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fixes from Eric Biederman:
"This tree contains 4 fixes.
The first is a fix for a race that can causes oopses under the right
circumstances, and that someone just recently encountered.
Past that are several small trivial correct fixes. A real issue that
was blocking development of an out of tree driver, but does not appear
to have caused any actual problems for in-tree code. A potential
deadlock that was reported by lockdep. And a deadlock people have
experienced and took the time to track down caused by a cleanup that
removed the code to drop a reference count"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
sysctl: Drop reference added by grab_header in proc_sys_readdir
pid: fix lockdep deadlock warning due to ucount_lock
libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount
mnt: Protect the mountpoint hashtable with mount_lock
Diffstat (limited to 'net/batman-adv/main.h')