commit | 4ca6df134847a6349620b485a3e63f00fb3bfad8 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 12 19:43:20 2017 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 12 19:43:20 2017 -0700 |
tree | bf3ccdc0eaa41a2b51f134ba32d3ba28c9578b92 | |
parent | edaf3825182958a1fd5e39708fcb6ea48eca2060 [diff] | |
parent | 2fd1d2c4ceb2248a727696962cf3370dc9f5a0a4 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace Pull sysctl fix from Eric Biederman: "A rather embarassing and hard to hit bug was merged into 4.11-rc1. Andrei Vagin tracked this bug now and after some staring at the code I came up with a fix" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: proc: Fix proc_sys_prune_dcache to hold a sb reference