aboutsummaryrefslogtreecommitdiff
path: root/net/can
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-01-19 11:38:19 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2018-01-19 11:38:19 -0800
commitec835f8104a21f4d4eeb9d316ee71d2b4a7f00de (patch)
tree3f66631c67518a85e2421b90365df79715482cf5 /net/can
parent672bb0fa9a8303cbd678dc60e315c84dda913ce1 (diff)
parent1ebe1eaf2f02784921759992ae1fde1a9bec8fd0 (diff)
downloadlinux-stericsson-ec835f8104a21f4d4eeb9d316ee71d2b4a7f00de.tar.gz
Merge tag 'trace-v4.15-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt: "Two more small fixes - The conversion of enums into their actual numbers to display in the event format file had an off-by-one bug, that could cause an enum not to be converted, and break user space parsing tools. - A fix to a previous fix to bring back the context recursion checks. The interrupt case checks for NMI, IRQ and softirq, but the softirq returned the same number regardless if it was set or not, although the logic would force it to be set if it were hit" * tag 'trace-v4.15-rc4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix converting enum's from the map in trace_event_eval_update() ring-buffer: Fix duplicate results in mapping context to bits in recursive lock
Diffstat (limited to 'net/can')
0 files changed, 0 insertions, 0 deletions