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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1BD2C76196 for ; Tue, 11 Apr 2023 16:48:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Pxkw5f8sz99TU4O3q4fsk7ARCt66v4KMWd9mwm8t+KA=; b=rC/dR7KaDVGOQ3 DUpnShYB4UaqCXdFZQ4+XUT3S/ycFj+lGbrLLG16RdCn+0UdUvqsjgT6LmaUzdEVhyNfdlbi+xNWT kh6EwrPq7DkDCTx11DYplZybDR75NviTmumVeV6LkRP34AKuVcYBwmgPs/6TZ3d8XN4ITak39H8/V Sb459A/MWlLeB8RURu0s6yC8E6AKfQXVaorubMT+PUBjlLPNRhxHdELPs9xPWsXDvIgCZU48C8qWw 5uQ/KoC/XboUokgisyur1qD4e8eU0HUxRhkR49MnLm+h21dHp7L0sx353nP20OUrWH13e30yzQkYK TYdpDJ3ZNdrAgoigaiwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pmH9w-000bhU-1y; Tue, 11 Apr 2023 16:47:56 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pmH9u-000bgj-2U for linux-arm-kernel@lists.infradead.org; Tue, 11 Apr 2023 16:47:56 +0000 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 D8BBD622FE; Tue, 11 Apr 2023 16:47:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78D4DC4339C; Tue, 11 Apr 2023 16:47:51 +0000 (UTC) Date: Tue, 11 Apr 2023 12:47:49 -0400 From: Steven Rostedt To: Mark Rutland Cc: Florent Revest , catalin.marinas@arm.com, will@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, bpf@vger.kernel.org, mhiramat@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kpsingh@kernel.org, jolsa@kernel.org, xukuohai@huaweicloud.com, lihuafei1@huawei.com, Linus Torvalds Subject: Re: [PATCH v6 0/5] Add ftrace direct call for arm64 Message-ID: <20230411124749.7aeea715@gandalf.local.home> In-Reply-To: References: <20230405180250.2046566-1-revest@chromium.org> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230411_094754_845936_CC15104C X-CRM114-Status: GOOD ( 14.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 11 Apr 2023 16:56:45 +0100 Mark Rutland wrote: > IIUC Steve was hoping to take the FUNCTION_GRAPH_RETVAL series through the > trace tree, and if that's still the plan, maybe both should go that way? The conflict is minor, and I think I prefer to still have the ARM64 bits go through the arm64 tree, as it will get better testing, and I don't like to merge branches ;-) I've added Linus to the Cc so he knows that there will be conflicts, but as long as we mention it in our pull request, with a branch that includes the solution, it should be fine going through two different trees. -- Steve _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel