diff options
author | 2012-12-27 10:42:46 -0800 | |
---|---|---|
committer | 2012-12-27 10:42:46 -0800 | |
commit | ddf75ae34e61bc8472f8b54281ad29bc87274be1 (patch) | |
tree | cd93e82253bc35d1bd97859f7b6353223e0c2f84 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
parent | f2fs: Don't assign e_id in f2fs_acl_from_disk (diff) | |
download | linux-dev-ddf75ae34e61bc8472f8b54281ad29bc87274be1.tar.xz linux-dev-ddf75ae34e61bc8472f8b54281ad29bc87274be1.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull namespace fixes from Eric Biederman:
"This tree includes two bug fixes for problems Oleg spotted on his
review of the recent pid namespace work. A small fix to not enable
bottom halves with irqs disabled, and a trivial build fix for f2fs
with user namespaces enabled."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
f2fs: Don't assign e_id in f2fs_acl_from_disk
proc: Allow proc_free_inum to be called from any context
pidns: Stop pid allocation when init dies
pidns: Outlaw thread creation after unshare(CLONE_NEWPID)
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions