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 X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E6C8C43603 for ; Wed, 11 Dec 2019 14:35:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 38DDB22B48 for ; Wed, 11 Dec 2019 14:35:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729957AbfLKOe7 (ORCPT ); Wed, 11 Dec 2019 09:34:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:38588 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729653AbfLKOe6 (ORCPT ); Wed, 11 Dec 2019 09:34:58 -0500 Received: from gandalf.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 33F0C20836; Wed, 11 Dec 2019 14:34:58 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.92.3) (envelope-from ) id 1if34q-0010bL-ME; Wed, 11 Dec 2019 09:34:56 -0500 Message-Id: <20191211143422.570348522@goodmis.org> User-Agent: quilt/0.65 Date: Wed, 11 Dec 2019 09:34:22 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton Subject: [for-linus][PATCH 0/3] tracing: More updates for 5.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Alexei Starovoitov (1): ftrace: Fix function_graph tracer interaction with BPF trampoline Steven Rostedt (VMware) (1): module: Remove accidental change of module_enable_x() YueHaibing (1): tracing: remove set but not used variable 'buffer' ---- arch/x86/kernel/ftrace.c | 14 -------------- include/linux/ftrace.h | 5 +++++ kernel/module.c | 6 +----- kernel/trace/fgraph.c | 9 +++++++++ kernel/trace/ftrace.c | 19 +++++++------------ kernel/trace/trace_events_inject.c | 2 -- 6 files changed, 22 insertions(+), 33 deletions(-)