linux-next: manual merge of the tracing tree with the net tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tracing tree got a conflict in
net/core/net-traces.c between commit
4ea7e38696c7e798c47ebbecadfd392f23f814f9 ("dropmon: add ability to detect
when hardware dropsrxpackets") from the net tree and commit
a8d154b009168337494fbf345671bab74d3e4b8b ("tracing: create automated
trace defines") from the tracing tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc net/core/net-traces.c
index b07b25b,499a67e..0000000
--- a/net/core/net-traces.c
+++ b/net/core/net-traces.c
@@@ -25,9 -23,7 +23,10 @@@
  #include <asm/unaligned.h>
  #include <asm/bitops.h>
  
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/skb.h>
++#include <trace/napi.h>
  
- DEFINE_TRACE(kfree_skb);
  EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
 +
- DEFINE_TRACE(napi_poll);
 +EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/