diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-07-18 12:19:20 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-07-18 12:19:20 +0200 |
commit | 2336ebc32676df5b794acfe0c980583ec6c05f34 (patch) | |
tree | 1959b68ad8750d42f7fe5f3cefad910c97061e66 /net/sysctl_net.c | |
parent | ec6dbcb7ade2a616675cbe3185cf299ee1615c9f (diff) | |
parent | fb578179a54553716afb0666a4d8c194acd313ba (diff) | |
download | linux-2336ebc32676df5b794acfe0c980583ec6c05f34.tar.bz2 |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
. Update attr test with PERF_FLAG_FD_CLOEXEC flag (Jiri Olsa)
. Enable close-on-exec flag on perf file descriptor (Yann Droneaud)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/sysctl_net.c')
0 files changed, 0 insertions, 0 deletions