Linus,

This includes two fixes

 - Bring back context level recursive protection in ring buffer.
   The simpler counter protection failed, due to a path when
   tracing with trace_clock_global() as it could not be reentrant
   and depended on the ring buffer recursive protection to keep that
   from happening.

 - Prevent branch profiling when FORTIFY_SOURCE is enabled. It causes
   50 - 60 MB in warning messages. Branch profiling should never be
   run on production systems, so there's no reason that it needs to
   be enabled with FORTIFY_SOURCE.

Please pull the latest trace-v4.15-rc4-2 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v4.15-rc4-2

Tag SHA1: a7fa05e04911a3f5c77818516b137ac742523911
Head SHA1: 68e76e034b6b1c1ce2eece1ab8ae4008e14be470


Randy Dunlap (1):
      tracing: Prevent PROFILE_ALL_BRANCHES when FORTIFY_SOURCE=y

Steven Rostedt (VMware) (1):
      ring-buffer: Bring back context level recursive checks

----
 kernel/trace/Kconfig       |  2 +-
 kernel/trace/ring_buffer.c | 62 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 46 insertions(+), 18 deletions(-)

Reply via email to