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 X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F102C3524B for ; Mon, 3 Feb 2020 03:16:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0146B208C3 for ; Mon, 3 Feb 2020 03:16:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580699813; bh=ae9YpC4L5lVTb2VIGcOUHSsDKMdaBBAmS5+A5LM1ZGc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=CXhHS8Ef7+kVhss/29RRwvTt9rLZAHmyXYjco4cQlLVpL2f4Z8/fZ5Gba4Tdj+/qC rbv+Z9A1caPIwofKi3mNwnJOPY7t7RAUNhVs3tWRzRgNpda0mah067cLUUNb7HHlt2 HEJMbXG8cYnsKWkuwIyLlY65M9TSx1A09rzU4RgQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727189AbgBCDQv (ORCPT ); Sun, 2 Feb 2020 22:16:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:39478 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726733AbgBCDQv (ORCPT ); Sun, 2 Feb 2020 22:16:51 -0500 Received: from devnote2 (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (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 4EFA220721; Mon, 3 Feb 2020 03:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580699809; bh=ae9YpC4L5lVTb2VIGcOUHSsDKMdaBBAmS5+A5LM1ZGc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=KJUAjHcqiLWbPAwR172CD2SdNGcD+4Zz38mCThFSWejEPAAXoC/8itG90/Aid1Xu/ qYE6p58B9z6Bc2EJ+3vTXdJeQPkQAv3cESO0ftj9LWkNq2kZCH3XdDssZ1mMg4NCmq muEPrvd5U7jjhM2Q7Xf+qmvoJIYn/kDcfqt7Uuxo= Date: Mon, 3 Feb 2020 12:16:45 +0900 From: Masami Hiramatsu To: Stephen Rothwell Cc: Steven Rostedt , Andrew Morton , Linux Next Mailing List , Linux Kernel Mailing List , Masami Hiramatsu , Arvind Sankar Subject: Re: linux-next: manual merge of the akpm-current tree with the ftrace tree Message-Id: <20200203121645.18b8e5aaa6dd22b7f9e7c928@kernel.org> In-Reply-To: <20200203115132.04e5ed05@canb.auug.org.au> References: <20200115164708.6c51494c@canb.auug.org.au> <20200203115132.04e5ed05@canb.auug.org.au> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, On Mon, 3 Feb 2020 11:51:32 +1100 Stephen Rothwell wrote: > Hi all, > > On Wed, 15 Jan 2020 16:47:08 +1100 Stephen Rothwell wrote: > > > > Hi all, > > > > Today's linux-next merge of the akpm-current tree got a conflict in: > > > > init/main.c > > > > between commit: > > > > 0068c92a9270 ("init/main.c: Alloc initcall_command_line in do_initcall() and free it") > > > > from the ftrace tree and commit: > > > > 21cc5aef9811 ("init/main.c: remove unnecessary repair_env_string in do_initcall_level") > > > > from the akpm-current tree. > > > > I fixed it up (see below) 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 for noticing the conflict and fixing! > > @@@ -1162,15 -990,22 +1161,21 @@@ static const char *initcall_level_names > > "late", > > }; > > > > + static int __init ignore_unknown_bootoption(char *param, char *val, > > + const char *unused, void *arg) > > + { > > + return 0; > > + } > > + > > -static void __init do_initcall_level(int level) > > +static void __init do_initcall_level(int level, char *command_line) > > { > > initcall_entry_t *fn; > > > > - strcpy(initcall_command_line, saved_command_line); > > parse_args(initcall_level_names[level], > > - initcall_command_line, __start___param, > > + command_line, __start___param, > > __stop___param - __start___param, > > level, level, > > - NULL, &repair_env_string); > > + NULL, ignore_unknown_bootoption); > > > > trace_initcall_level(initcall_level_names[level]); > > for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) > > This is now a conflict between the ftrace tree and Linus' tree. Yeah, this fix looks good to me. As far as I can see, the issue is below 2 lines. > > -static void __init do_initcall_level(int level) > > +static void __init do_initcall_level(int level, char *command_line) Basically, the command_line is copied from saved_command_line each time when do_initcall_level() is invoked, so the precondition of the commit 21cc5aef9811 ("init/main.c: remove unnecessary repair_env_string in do_initcall_level") remains the same. Thank you, -- Masami Hiramatsu