From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932581AbeASRmO (ORCPT ); Fri, 19 Jan 2018 12:42:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:43894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932175AbeASRmB (ORCPT ); Fri, 19 Jan 2018 12:42:01 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E0C9120C0F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Message-Id: <20180119174131.963752801@goodmis.org> User-Agent: quilt/0.63-1 Date: Fri, 19 Jan 2018 12:41:31 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Ingo Molnar , Andrew Morton Subject: [PATCH 0/2] [GIT PULL] tracing: A couple more small fixes for 4.15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linus, Two more small fixes - The conversion of enums into their actual numbers to display in the event format file had an off-by-one bug, that could cause an enum not to be converted, and break user space parsing tools. - A fix to a previous fix to bring back the context recursion checks. The interrupt case checks for NMI, IRQ and softirq, but the softirq returned the same number regardless if it was set or not, although the logic would force it to be set if it were hit. Please pull the latest trace-v4.15-rc4-3 tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git trace-v4.15-rc4-3 Tag SHA1: 731752ff22e86fd5a139de2f1a300cd9746ac870 Head SHA1: 1ebe1eaf2f02784921759992ae1fde1a9bec8fd0 Steven Rostedt (VMware) (2): ring-buffer: Fix duplicate results in mapping context to bits in recursive lock tracing: Fix converting enum's from the map in trace_event_eval_update() ---- kernel/trace/ring_buffer.c | 3 +-- kernel/trace/trace_events.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-)