summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linusLinus Torvalds2016-05-191-10/+3
|\
| * secomp: Constify mode1 syscall whitelistMatt Redfearn2016-05-131-2/+2
| * seccomp: Get compat syscalls from asm-generic headerMatt Redfearn2016-05-131-8/+1
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2016-05-192-4/+5
|\ \
| * \ Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/g...James Morris2016-05-061-3/+4
| |\ \
| | * | KEYS: Move the point of trust determination to __key_link()David Howells2016-04-111-1/+1
| | * | PKCS#7: Make trust determination dependent on contents of trust keyringDavid Howells2016-04-061-1/+1
| | * | KEYS: Generalise system_verify_data() to provide access to internal contentDavid Howells2016-04-061-2/+3
| * | | seccomp: Fix comment typoMickaël Salaün2016-05-041-1/+1
| |/ /
* | | Merge tag 'trace-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2016-05-1810-284/+3930
|\ \ \
| * | | tracing: Use temp buffer when filtering eventsSteven Rostedt (Red Hat)2016-05-034-8/+185
| * | | tracing: Remove TRACE_EVENT_FL_USE_CALL_FILTER logicSteven Rostedt (Red Hat)2016-05-021-61/+10
| * | | tracing: Remove unused function trace_current_buffer_lock_reserve()Steven Rostedt (Red Hat)2016-04-291-10/+0
| * | | tracing: Remove one use of trace_current_buffer_lock_reserve()Steven Rostedt (Red Hat)2016-04-291-8/+10
| * | | tracing: Have trace_buffer_unlock_commit() call the _regs version with NULLSteven Rostedt (Red Hat)2016-04-292-15/+9
| * | | tracing: Remove unused function trace_current_buffer_discard_commit()Steven Rostedt (Red Hat)2016-04-291-8/+0
| * | | tracing: Move trace_buffer_unlock_commit{_regs}() to local headerSteven Rostedt (Red Hat)2016-04-292-2/+10
| * | | tracing: Fold filter_check_discard() into its only userSteven Rostedt (Red Hat)2016-04-292-20/+6
| * | | tracing: Make filter_check_discard() localSteven Rostedt (Red Hat)2016-04-272-2/+6
| * | | tracing: Move event_trigger_unlock_commit{_regs}() to local headerSteven Rostedt (Red Hat)2016-04-261-0/+94
| * | | tracing: Don't use the address of the buffer array name in copy_from_userWang Xiaoqiang2016-04-261-3/+3
| * | | tracing: Handle tracing_map_alloc_elts() error path correctlyTom Zanussi2016-04-261-2/+6
| * | | tracing: Add check for NULL event field when creating hist fieldTom Zanussi2016-04-261-0/+3
| * | | tracing: checking for NULL instead of IS_ERR()Dan Carpenter2016-04-261-1/+1
| * | | tracing: Do not inherit event-fork option for instancesSteven Rostedt (Red Hat)2016-04-251-1/+10
| * | | tracing: Fix unsigned comparison to zero in hist trigger codeSteven Rostedt (Red Hat)2016-04-191-2/+2
| * | | tracing: Add hist trigger 'log2' modifierNamhyung Kim2016-04-192-0/+21
| * | | tracing: Add support for named hist triggersTom Zanussi2016-04-192-21/+141
| * | | tracing: Add support for named triggersTom Zanussi2016-04-192-0/+156
| * | | tracing: Add support for multiple hist triggers per eventTom Zanussi2016-04-192-35/+145
| * | | tracing: Add enable_hist/disable_hist triggersTom Zanussi2016-04-194-31/+195
| * | | tracing: Remove restriction on string position in hist trigger keysTom Zanussi2016-04-191-28/+35
| * | | tracing: Support string type key properlyNamhyung Kim2016-04-191-4/+45
| * | | tracing: Add hist trigger support for stacktraces as keysTom Zanussi2016-04-192-42/+109
| * | | tracing: Add hist trigger 'syscall' modifierTom Zanussi2016-04-192-1/+17
| * | | tracing: Add hist trigger 'execname' modifierTom Zanussi2016-04-192-2/+101
| * | | tracing: Add hist trigger 'sym' and 'sym-offset' modifiersTom Zanussi2016-04-192-5/+28
| * | | tracing: Add hist trigger 'hex' modifier for displaying numeric fieldsTom Zanussi2016-04-192-7/+60
| * | | tracing: Add hist trigger support for clearing a traceTom Zanussi2016-04-192-3/+26
| * | | tracing: Add hist trigger support for pausing and continuing a traceTom Zanussi2016-04-192-4/+34
| * | | tracing: Add hist trigger support for user-defined sorting ('sort=' param)Tom Zanussi2016-04-192-4/+114
| * | | tracing: Add hist trigger support for compound keysTom Zanussi2016-04-192-15/+36
| * | | tracing: Add hist trigger support for multiple values ('vals=' param)Tom Zanussi2016-04-192-6/+85
| * | | tracing: Add 'hist' event trigger commandTom Zanussi2016-04-197-0/+895
| * | | tracing: Update some tracing_map constants and commentsTom Zanussi2016-04-192-4/+5
| * | | tracing: Fix TRACING_MAP KconfigSteven Rostedt (Red Hat)2016-04-192-4/+1
| * | | tracing: Add lock-free tracing_mapTom Zanussi2016-04-194-0/+1354
| * | | tracing: Add infrastructure to allow set_event_pid to follow childrenSteven Rostedt2016-04-193-10/+79
| * | | tracing: Use pid bitmap instead of a pid array for set_event_pidSteven Rostedt2016-04-192-124/+102
| * | | tracing: Rename check_ignore_pid() to ignore_this_task()Steven Rostedt2016-04-191-7/+7
OpenPOWER on IntegriCloud