From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 May 2017 03:36:38 +0000 (-0700)
Subject: Merge tag 'trace-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt... 
X-Git-Tag: v4.14-rc1~959
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00d959333513a41959d3b85ba3e35320ec8844e5;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'trace-v4.12-2' of git://git./linux/kernel/git/rostedt/linux-trace

Pull more tracing updates from Steven Rostedt:
 "These are three simple changes.

  The first one is just a switch from using strcpy() to strlcpy().
  Someone thought that it may cause an overflow bug, but since it only
  copies comms into a pre-allocated array of TASK_COMM_LEN, and no comm
  should ever be bigger than that, nor not end with a nul character,
  this change is more of a safety precaution than fixing anything that
  is actually broken.

  The other two changes are simply cleaning and optimizing some code"

* tag 'trace-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftrace: Simplify ftrace_match_record() even more
  ftrace: Remove an unneeded condition
  tracing: Use strlcpy() instead of strcpy() in __trace_find_cmdline()
---

00d959333513a41959d3b85ba3e35320ec8844e5