]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2de157f 94894d7)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 May 2016 15:41:57 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 May 2016 15:41:57 +0000 (08:41 -0700)
commit344eac45944dd198a9588237c11b6bae61d1df60
tree59ec83e4c2e448abce9a65e32e226ed39f9e40c9tree | snapshot
parent2de157f23dd6fe1dbe084aac71ffd066aad88cebcommit | diff
parent94894d714fa78602b6eef864bf043f35a771cbd4commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull userns fix from Eric Biederman:
 "This contains just a single fix for a nasty oops"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  propogate_mnt: Handle the first propogated copy being a slave
Linux Kernel Source Tree.