From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754935AbcCWMZT (ORCPT ); Wed, 23 Mar 2016 08:25:19 -0400 Received: from mail.kernel.org ([198.145.29.136]:42955 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbcCWMZP (ORCPT ); Wed, 23 Mar 2016 08:25:15 -0400 Message-Id: <20160323122443.532267312@goodmis.org> User-Agent: quilt/0.61-1 Date: Wed, 23 Mar 2016 08:24:43 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton Subject: [for-next][PATCH 0/2] tracing: Some last minute changes before I push for 4.6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git for-next Head SHA1: 7e6867bf831c71fe0e47438831ae3a94d4c7ab3c Peter Zijlstra (1): tracing: Record and show NMI state Steven Rostedt (Red Hat) (1): tracing: Fix trace_printk() to print when not using bprintk() ---- include/linux/kernel.h | 6 +++--- kernel/trace/trace.c | 1 + kernel/trace/trace.h | 1 + kernel/trace/trace_output.c | 10 +++++++--- kernel/trace/trace_printk.c | 3 +++ 5 files changed, 15 insertions(+), 6 deletions(-)