diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-18 10:04:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-18 10:04:42 -0700 |
| commit | 16d95c43965d287987505bbd875e59e5b3c9b131 (patch) | |
| tree | d7a13bc8be1e1f93bd1dd9800bd99b9172175f34 /kernel/ucount.c | |
| parent | af5d28565f5822fb6a280d2de07315dad487f1f1 (diff) | |
| parent | 3fd37226216620c1a468afa999739d5016fbc349 (diff) | |
| download | linux-16d95c43965d287987505bbd875e59e5b3c9b131.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull pid namespace fixes from Eric Biederman:
"These are two bugs that turn out to have simple fixes that were
reported during the merge window. Both of these issues have existed
for a while and it just happens that they both were reported at almost
the same time"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
pid_ns: Fix race between setns'ed fork() and zap_pid_ns_processes()
pid_ns: Sleep in TASK_INTERRUPTIBLE in zap_pid_ns_processes
Diffstat (limited to 'kernel/ucount.c')
0 files changed, 0 insertions, 0 deletions