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 8B4DAC05027 for ; Mon, 23 Jan 2023 22:50:54 +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=6DdT20OovQyav/njJW8NSQvjxAvtCFcphisQchh5xfk=; b=FVBhnPzHUTDmAu bIAoD6G6BWMa5N3eIf2cpKwDnkDGLTKzAwIeT6toj48pgJt2kvedklFeoUF+J82hXSzuVry61AHDK Yp2mTiZRW9yf+w9EvFx+V095GgFczXbQC9bkB9i6+RESgLfDtLRKjt0LR+/ufoV1iJ8hGYq4PZsqh 7oM1YigYRGW72Z2kot8jJOhScSxWastNsItLg0Mk66O3wy3wFQTmvcdMYu+hOYBlxi+4VUIEEqIZF Aq64449HhpQAMBSN2ADeRpkN9mLu2C+hQftafuh5cYGERhlizH2CYhTwXlpJw3uK6BN4DUlNxfeHE Y3R87jYx5+Tc9JmVQW9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pK5dZ-001kRo-SH; Mon, 23 Jan 2023 22:50:01 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pK5dW-001kQL-BU for linux-arm-kernel@lists.infradead.org; Mon, 23 Jan 2023 22:49:59 +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 ams.source.kernel.org (Postfix) with ESMTPS id D19E7B80EB8; Mon, 23 Jan 2023 22:49:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1900C4339B; Mon, 23 Jan 2023 22:49:53 +0000 (UTC) Date: Mon, 23 Jan 2023 17:49:52 -0500 From: Steven Rostedt To: Catalin Marinas Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, mhiramat@kernel.org, ndesaulniers@google.com, ojeda@kernel.org, peterz@infradead.org, rafael.j.wysocki@intel.com, revest@chromium.org, robert.moore@intel.com, will@kernel.org Subject: Re: [PATCH v3 0/8] arm64/ftrace: Add support for DYNAMIC_FTRACE_WITH_CALL_OPS Message-ID: <20230123174952.68b4a07e@gandalf.local.home> In-Reply-To: References: <20230123134603.1064407-1-mark.rutland@arm.com> 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-20230123_144958_568583_03A4C914 X-CRM114-Status: GOOD ( 21.54 ) 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 Mon, 23 Jan 2023 14:40:29 +0000 Catalin Marinas wrote: > Hi Mark, > > On Mon, Jan 23, 2023 at 01:45:55PM +0000, Mark Rutland wrote: > > I'm not sure how we want to merge this, so I've moved the core ftrace > > patch to the start of the series so that it can more easily be placed on > > a stable branch if we want that to go via the ftrace tree and the rest > > to go via arm64. > > Happy to queue the whole series since Steve acked the ftrace changes. > But I'll put on a stable branch in case there are any conflicts with the > ftrace tree. > I actually do have a conflict with this patch (I'll post it soon). I could just cherry pick it from your tree. Linus seems to be OK with that when it's just a single change. -- Steve _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel