Re: [RESEND PATCH] tools/bootconfig: Fix a compilation issue with missing variable

[Steven Rostedt <rostedt@goodmis.org>]

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)
> 
> 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.
> 
> Regards,
> Punit
> 
> [0] https://lkml.kernel.org/r/162262194685.264090.7738574774030567419.stgit@devnote2

OK, I looked into this deeper, and found it to be a merge conflict bug.

Although I test the bootconfig kernel side, I didn't test the
bootconfig tools side (need to update my tests)

I applied

   https://lkml.kernel.org/r/20210414134647.1870-1-zuoqilin1@163.com

first, and then applied this patch, and made the (incorrect) updates.

I didn't test the tools build (which I need to update), and that's the
cause of the bug.

Thanks for the report.

-- Steve