From: David S. Miller <davem@davemloft.net>
Date: Tue, 2 Jan 2018 19:28:07 +0000 (-0500)
Subject: Merge branch 'tcp-sctp-dccp-Replace-jprobe-usage-with-trace-events'
X-Git-Tag: v4.16-rc1~123^2~257
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=acfbf3ca313edd550f0139fe70509cb3b0b38932;p=linux.git

Merge branch 'tcp-sctp-dccp-Replace-jprobe-usage-with-trace-events'

Masami Hiramatsu says:

====================
net: tcp: sctp: dccp: Replace jprobe usage with trace events

This series is v7 of the replacement of jprobe usage with trace
events. This version fixes net/dccp/trace.h to avoid sparse
warning. Since the TP_STORE_ADDR_PORTS macro can be shared
with trace/events/tcp.h, it also introduce a new common header
file and move the definition of that macro.

Previous version is here;
 https://lkml.org/lkml/2017/12/28/7

Changes from v6:
  [5/6]: Avoid preprocessor directives in tracepoint macro args
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

acfbf3ca313edd550f0139fe70509cb3b0b38932