LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Punit Agrawal <punitagrawal@gmail.com>,
	mhiramat@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [RESEND PATCH] tools/bootconfig: Fix a compilation issue with missing variable
Date: Wed, 8 Sep 2021 09:41:45 +0900	[thread overview]
Message-ID: <20210908094145.babedcd252d8e8caf0e2f2ad@kernel.org> (raw)
In-Reply-To: <20210907202400.330f4ea4@rorschach.local.home>

On Tue, 7 Sep 2021 20:24:00 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:

> On Wed,  8 Sep 2021 08:07:10 +0900
> Punit Agrawal <punitagrawal@gmail.com> wrote:
> 
> > While looking to build bootconfig tool in order to debug a kernel boot
> > time issue I noticed that tool fails to compile. The broken changes
> > were introduced by commit e5efaeb8a8f5 ("bootconfig: Support mixing a
> > value and subkeys under a key").
> > 
> > Fix the compile issue by introducing a "ret" variable to track the
> > return value from xbc_node_compose_key().
> > 
> > Fixes: e5efaeb8a8f5 ("bootconfig: Support mixing a value and subkeys under a key")
> > Signed-off-by: Punit Agrawal <punitagrawal@gmail.com>
> > Cc: Masami Hiramatsu <mhiramat@kernel.org>
> > Cc: Steven Rostedt <rostedt@goodmis.org>
> > ---
> > 
> > (Apologies for the resend. I fat-fingered the email address for lkml)
> 
> And I'm resending my reply to have it recorded as well.
> 
> > 
> > Hi Masami,
> > 
> > I am not sure what went wrong but the patch in the lore link[0]
> > doesn't match the end result (bad merge?). You may want to recheck the
> > other changes to make sure it all looks sane.
> 
> 
> Thanks for reporting this. This is strange. Especially since it's all
> scripts that are used to import these.
> 
> I do remember doing a rebase to fix some issues in another unrelated
> patch. I wonder if I accidentally messed this up during that rebase :-/
> 
> I'll have to investigate this.
> 
> I'll checkout the tree before the affected patch, and reapply the
> changes from my scripts to see if it wasn't my script that broke.
> 
> Again, thanks for reporting this!

Hi Steve,

I've investigated that why this happens here.

https://lore.kernel.org/all/20210831033256.5973-1-jcfaracco@gmail.com/T/#m52f43f6deb874ee726b10ce25ba53e44697a275a

This seems a timing issue. I acked a "simplify" patch April, and
the I wrongly worked on the linus tree for "mixing a value and subkeys"
and send it to you June. At last, those 2 conflicted on your branch and
your merge script might just merge it.
Actually, what Punit and Julio did is reverting 

commit 30d103f2d460 ("tools/bootconfig: Simplify expression")

Thank you,

-- 
Masami Hiramatsu <mhiramat@kernel.org>

  reply	other threads:[~2021-09-08  0:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-07 23:07 Punit Agrawal
2021-09-08  0:13 ` Masami Hiramatsu
2021-09-08  0:27   ` Steven Rostedt
2021-09-08  0:34   ` Masami Hiramatsu
2021-09-08  0:24 ` Steven Rostedt
2021-09-08  0:41   ` Masami Hiramatsu [this message]
2021-09-08  0:45     ` Steven Rostedt
2021-09-09  8:31       ` Punit Agrawal
2021-09-08  0:44 ` Steven Rostedt

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=20210908094145.babedcd252d8e8caf0e2f2ad@kernel.org \
    --to=mhiramat@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=punitagrawal@gmail.com \
    --cc=rostedt@goodmis.org \
    --subject='Re: [RESEND PATCH] tools/bootconfig: Fix a compilation issue with missing variable' \
    /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

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).