From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 207ACC76196 for ; Thu, 6 Apr 2023 19:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240506AbjDFTMu (ORCPT ); Thu, 6 Apr 2023 15:12:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240403AbjDFTMg (ORCPT ); Thu, 6 Apr 2023 15:12:36 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D7CA83D1 for ; Thu, 6 Apr 2023 12:12:34 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7100862CEC for ; Thu, 6 Apr 2023 19:12:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D81ECC433EF; Thu, 6 Apr 2023 19:12:33 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1pkV28-001EXN-2S; Thu, 06 Apr 2023 15:12:32 -0400 Message-ID: <20230406191058.652785135@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 06 Apr 2023 15:10:58 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [for-linus][PATCH 0/2] tracing: A few more updates to 6.3 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some more tracing fixes for 6.3: - Reset direct->addr back to its original value on error in updating the direct trampoline code. - Make lastcmd_mutex static. git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace/urgent Head SHA1: 31c683967174b487939efaf65e41f5ff1404e141 Steven Rostedt (Google) (1): tracing/synthetic: Make lastcmd_mutex static Zheng Yejian (1): ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct() ---- kernel/trace/ftrace.c | 15 +++++++++------ kernel/trace/trace_events_synth.c | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-)