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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B87EEC433EF for ; Tue, 2 Nov 2021 13:17:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AC3861076 for ; Tue, 2 Nov 2021 13:17:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231366AbhKBNUC (ORCPT ); Tue, 2 Nov 2021 09:20:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:42208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231265AbhKBNUA (ORCPT ); Tue, 2 Nov 2021 09:20:00 -0400 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 CD69360EBC; Tue, 2 Nov 2021 13:17:23 +0000 (UTC) Date: Tue, 2 Nov 2021 09:17:22 -0400 From: Steven Rostedt To: Linus Torvalds Cc: LKML , Arnd Bergmann , Carles Pey , Changbin Du , Daniel Bristot de Oliveira , Jiri Olsa , Josh Poimboeuf , Kalesh Singh , Masami Hiramatsu , Mathieu Desnoyers , Punit Agrawal , "Robin H. Johnson" , Song Liu , Sven Schnelle , Tiezhu Yang , Viktor Rosendahl , Wang ShaoBo , Weizhao Ouyang , chongjiapeng , kernel test robot , =?UTF-8?B?546L6LSH?= , Heiko Carstens , "Gustavo A. R. Silva" Subject: Re: [GIT PULL] tracing: Updates for 5.16 Message-ID: <20211102091722.5375b885@gandalf.local.home> In-Reply-To: References: <20211101175544.00fc0d57@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 1 Nov 2021 20:08:30 -0700 Linus Torvalds wrote: > On Mon, Nov 1, 2021 at 2:55 PM Steven Rostedt wrote: > > > > Also, this pull request will conflict with your tree against a fix I had > > for trace recursions. I did the conflict resolution and pushed it to my > > ftrace/conflicts branch if you want to reference it. > > In the meantime, my tree had grown a few more conflicts elsewhere, but > it all looked fairly straightforward. > > It might be a good idea if you were to double-check that everything > looks good, though. > I performed the merge and conflict resolution to the same commit you used, and came up with pretty much the same (sans whitespace differences). The only thing I would like to bring attention to is the wording for the comment to kprobe_flush_task() that both Thomas and Masami updated, and I want to make sure they are both happy with the final result: Thomas, Masami ? /* * This function is called from delayed_put_task_struct() when a task is * dead and cleaned up to recycle any kretprobe instances associated with * this task. These left over instances represent probed functions that * have been called but will never return. */ void kprobe_flush_task(struct task_struct *tk) You OK with the above wording? -- Steve