From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752974AbbBJREQ (ORCPT ); Tue, 10 Feb 2015 12:04:16 -0500 Received: from cdptpa-outbound-snat.email.rr.com ([107.14.166.231]:63718 "EHLO cdptpa-oedge-vip.email.rr.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752260AbbBJREJ (ORCPT ); Tue, 10 Feb 2015 12:04:09 -0500 Message-Id: <20150210170221.012858236@goodmis.org> User-Agent: quilt/0.61-1 Date: Tue, 10 Feb 2015 12:02:21 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton Subject: [for-next][PATCH 0/5] tracing: Some last minute updates for 3.20 X-RR-Connecting-IP: 107.14.168.130:25 X-Cloudmark-Score: 0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some last minute updates for this merge window. Mostly documentantion and sample code changes. Nothing risky. But they went through my entire test suite anyway. There is also an urgent patch that got lost in my inbox that I added. git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next Head SHA1: 7215853e985a4bef1a6c14e00e89dfec84f1e457 Steven Rostedt (Red Hat) (4): tracing: Update the TRACE_EVENT fields available in the sample code tracing: Add TRACE_EVENT_CONDITION sample tracing: Add TRACE_EVENT_FN example tracing: Add samples of DECLARE_EVENT_CLASS() and DEFINE_EVENT() Vikram Mulukutla (1): tracing: Fix unmapping loop in tracing_mark_write ---- kernel/trace/trace.c | 2 +- samples/trace_events/trace-events-sample.c | 80 ++++++- samples/trace_events/trace-events-sample.h | 328 +++++++++++++++++++++++++++-- 3 files changed, 395 insertions(+), 15 deletions(-)