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 E12AAC433F5 for ; Tue, 2 Nov 2021 17:41:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C48D261051 for ; Tue, 2 Nov 2021 17:41:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234388AbhKBRo2 (ORCPT ); Tue, 2 Nov 2021 13:44:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:41948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231702AbhKBRo1 (ORCPT ); Tue, 2 Nov 2021 13:44:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 62FA66008E; Tue, 2 Nov 2021 17:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635874912; bh=3XSpQaUwPEKb13yeaG//g+9vOMJnbnGdxpaOEjWYUx8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Fbed59+RDIbJ4gdX6IAGZQRWG0RY2Q6PkeADnxdHTyKXYMIOXFaIKMcHPBtiVJap2 jlxy/uUI2LRtYW0mffIbeBgHosZGSb2ZDnxeMFymiiT1VejD/CnYiHX1SWzEAK9kXX h8RqtP8OBgoDslyaBQBu6Ut8wgJ3xhsk5Csuk9AQs0OYaYMuzWz1bMHA444/drK2Zt GCtVXL181pfSx708Ebic1iQaTWJVo3EflSrZfgKlffH2Hu9P6TUzL0LpCGyeG/BR/W +uDQUkFyx4pNGz00dAAEgJLmSNCJLeRJ3kj9mxViZwwoOGCyD2ZC5XMxrCS3XZ4Vnw zLW3v9Xmaobaw== Date: Wed, 3 Nov 2021 02:41:45 +0900 From: Masami Hiramatsu To: Steven Rostedt Cc: Linus Torvalds , 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: <20211103024145.8e3fafade181fc989f3baca6@kernel.org> In-Reply-To: <20211102091722.5375b885@gandalf.local.home> References: <20211101175544.00fc0d57@gandalf.local.home> <20211102091722.5375b885@gandalf.local.home> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; 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 Tue, 2 Nov 2021 09:17:22 -0400 Steven Rostedt wrote: > 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? Yes, this looks good to me :-) Thank you for merging nicely! -- Masami Hiramatsu