From: Masami Hiramatsu <mhiramat@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Arvind Sankar <nivedita@alum.mit.edu>
Subject: Re: linux-next: manual merge of the akpm-current tree with the ftrace tree
Date: Mon, 3 Feb 2020 12:16:45 +0900 [thread overview]
Message-ID: <20200203121645.18b8e5aaa6dd22b7f9e7c928@kernel.org> (raw)
In-Reply-To: <20200203115132.04e5ed05@canb.auug.org.au>
Hi,
On Mon, 3 Feb 2020 11:51:32 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Wed, 15 Jan 2020 16:47:08 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 <mhiramat@kernel.org>
next prev parent reply other threads:[~2020-02-03 3:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 5:47 linux-next: manual merge of the akpm-current tree with the ftrace tree Stephen Rothwell
2020-02-03 0:51 ` Stephen Rothwell
2020-02-03 3:16 ` Masami Hiramatsu [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-25 8:54 Stephen Rothwell
2014-11-24 9:22 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200203121645.18b8e5aaa6dd22b7f9e7c928@kernel.org \
--to=mhiramat@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nivedita@alum.mit.edu \
--cc=rostedt@goodmis.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).