]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: edaf382 2fd1d2c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jul 2017 02:43:20 +0000 (19:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jul 2017 02:43:20 +0000 (19:43 -0700)
commit4ca6df134847a6349620b485a3e63f00fb3bfad8
treebf3ccdc0eaa41a2b51f134ba32d3ba28c9578b92tree | snapshot
parentedaf3825182958a1fd5e39708fcb6ea48eca2060commit | diff
parent2fd1d2c4ceb2248a727696962cf3370dc9f5a0a4commit | 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
Michael's Linux tree.