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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EEB7EC77B61 for ; Tue, 11 Apr 2023 03:01:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229901AbjDKDBL (ORCPT ); Mon, 10 Apr 2023 23:01:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229711AbjDKDBI (ORCPT ); Mon, 10 Apr 2023 23:01:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 953051B1; Mon, 10 Apr 2023 20:01:06 -0700 (PDT) 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 302B66206C; Tue, 11 Apr 2023 03:01:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE94EC433D2; Tue, 11 Apr 2023 03:01:04 +0000 (UTC) Date: Mon, 10 Apr 2023 23:01:03 -0400 From: Steven Rostedt To: Stephen Rothwell Cc: Masami Hiramatsu , Florent Revest , Linux Kernel Mailing List , Linux Next Mailing List , Zheng Yejian Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree Message-ID: <20230410230103.173daf23@gandalf.local.home> In-Reply-To: <20230411124602.5938513c@canb.auug.org.au> References: <20230411124602.5938513c@canb.auug.org.au> 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 Tue, 11 Apr 2023 12:46:02 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the ftrace tree got a conflict in: > > kernel/trace/ftrace.c > > between commit: > > 2a2d8c51defb ("ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()") > > from Linus' tree and commit: > > 8788ca164eb4 ("ftrace: Remove the legacy _ftrace_direct API") > > from the ftrace tree. > > I fixed it up (the latter removed the lines changed by the latter, so I > did that) and can carry the fix as necessary. This is now fixed as far as > linux-next is concerned, but any non trivial conflicts should be mentioned > to your upstream maintainer when your tree is submitted for merging. > You may also want to consider cooperating with the maintainer of the > conflicting tree to minimise any particularly complex conflicts. > Thanks. I'll probably hit that before sending to Linus as well, as I should hopefully remember to test merging my pull request before sending. The one in Linus's tree is a stable fix for code that will become obsolete in the next merge window (hence its removal). -- Steve