summaryrefslogtreecommitdiffstats
path: root/kernel/events
Commit message (Expand)AuthorAgeFilesLines
* vfs: do bulk POLL* -> EPOLL* replacementLinus Torvalds2018-02-112-2/+2
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2018-01-311-0/+10
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-nextDavid S. Miller2017-12-181-0/+10
| |\
| | * bpf/tracing: fix kernel/events/core.c compilation errorYonghong Song2017-12-131-1/+1
| | * bpf: add a bpf_override_function helperJosef Bacik2017-12-121-0/+7
| | * bpf/tracing: allow user space to query prog array on the same tpYonghong Song2017-12-121-0/+3
* | | Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2018-01-301-2/+2
|\ \ \
| * | | ipc, kernel, mm: annotate ->poll() instancesAl Viro2017-11-271-2/+2
| | |/ | |/|
* | | Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2018-01-301-0/+1
|\ \ \
| * | | perf: Export perf_event_update_userpageSuzuki K Poulose2018-01-021-0/+1
| | |/ | |/|
* | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2018-01-303-34/+39
|\ \ \
| * | | perf: Return empty callchain instead of NULLJiri Olsa2018-01-081-18/+12
| * | | perf: Make perf_callchain function staticJiri Olsa2018-01-083-19/+16
| * | | perf: Allocate context task_ctx_data for child eventJiri Olsa2018-01-081-0/+14
| |/ /
* | | Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2018-01-301-6/+6
|\ \ \
| * \ \ Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/pau...Ingo Molnar2018-01-031-6/+6
| |\ \ \ | | |/ / | |/| |
| | * | uprobes: Remove now-redundant smp_read_barrier_depends()Paul E. McKenney2017-12-041-6/+6
| | |/
* | | perf/core: Fix ctx::mutex deadlockPeter Zijlstra2018-01-251-1/+7
* | | perf/core: Fix another perf,trace,cpuhp lock inversionPeter Zijlstra2018-01-251-2/+24
* | | perf/core: Fix lock inversion between perf,trace,cpuhpPeter Zijlstra2018-01-251-2/+11
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-12-081-1/+1
|\ \
| * | bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program typeHendrik Brueckner2017-12-051-1/+1
| |/
* | Merge branch 'linus' into perf/urgent, to synchronize UAPI headersIngo Molnar2017-12-062-30/+18
|\ \ | |/
| * Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2017-11-261-0/+1
| |\
| | * perf/core: Fix memory leak triggered by perf --namespaceVasily Averin2017-11-151-0/+1
| * | Merge tag 'trace-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/rost...Linus Torvalds2017-11-171-9/+4
| |\ \
| | * | perf/ftrace: Revert ("perf/ftrace: Fix double traces of perf on ftrace:functi...Peter Zijlstra2017-10-161-9/+4
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2017-11-151-21/+10
| |\ \ \
| | * | | bpf: Revert bpf_overrid_function() helper changes.David S. Miller2017-11-111-7/+0
| | * | | bpf: add a bpf_override_function helperJosef Bacik2017-11-111-0/+7
| | * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-101-2/+4
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-11-042-0/+2
| | |\ \ \
| | * | | | bpf: permit multiple bpf attachments for a single perf eventYonghong Song2017-10-251-18/+8
| | * | | | bpf: use the same condition in perf event set/free bpf handlerYonghong Song2017-10-251-3/+3
| | * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2017-10-221-1/+9
| | |\ \ \ \
| | * | | | | bpf: perf event change needed for subsequent bpf helpersYonghong Song2017-10-071-2/+13
| | | |_|_|/ | | |/| | |
| * | | | | Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Linus Torvalds2017-11-151-0/+4
| |\ \ \ \ \
| | * | | | | perf/core: Export AUX buffer helpers to modulesWill Deacon2017-10-181-0/+4
| | |/ / / /
* | | | | | Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/a...Ingo Molnar2017-11-291-1/+4
|\ \ \ \ \ \
| * | | | | | perf: Fix header.size for namespace eventsJiri Olsa2017-11-281-1/+4
| |/ / / / /
* | | | | | Merge branch 'linus' into perf/urgent, to pick up dependent commitsIngo Molnar2017-11-292-283/+211
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2017-11-131-271/+199
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'linus' into perf/core, to fix conflictsIngo Molnar2017-11-073-2/+6
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | perf/core: Rewrite event timekeepingPeter Zijlstra2017-10-271-256/+129
| | * | | | | perf/core: Fix perf_event_read()Peter Zijlstra2017-10-271-16/+39
| | * | | | | perf/core: Remove wrong barrierPeter Zijlstra2017-10-271-5/+0
| | * | | | | perf/core: Rename 'enum perf_event_active_state'Peter Zijlstra2017-10-271-1/+1
| | * | | | | perf/core: Make sure to update ctx time before using itPeter Zijlstra2017-10-271-2/+10
| | * | | | | perf/core: Fix __perf_read_group_add() lockingPeter Zijlstra2017-10-271-2/+2
| | * | | | | perf/core: Update ctx time before detaching eventsPeter Zijlstra2017-10-271-0/+1
OpenPOWER on IntegriCloud