From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 10 Aug 2014 00:33:44 +0000 (-0700)
Subject: Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: Ubuntu-5.13.0-19.19~19601
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c23190c0bf1236e1eb5521a8b10d0102fbc1338c;p=mirror_ubuntu-jammy-kernel.git

Merge tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

Pull IPI tracepoints for ARM from Steven Rostedt:
 "Nicolas Pitre added generic tracepoints for tracing IPIs and updated
  the arm and arm64 architectures.  It required some minor updates to
  the generic tracepoint system, so it had to wait for me to implement
  them"

* tag 'trace-ipi-tracepoints' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ARM64: add IPI tracepoints
  ARM: add IPI tracepoints
  tracepoint: add generic tracepoint definitions for IPI tracing
  tracing: Do not do anything special with tracepoint_string when tracing is disabled
---

c23190c0bf1236e1eb5521a8b10d0102fbc1338c