projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3cedbec
5ec0811
)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 5 May 2016 15:41:57 +0000
(08:41 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Thu, 5 May 2016 15:41:57 +0000
(08:41 -0700)
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
Trivial merge