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=-13.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS autolearn=ham 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 DD299C433F5 for ; Wed, 8 Sep 2021 00:41:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C1CE361132 for ; Wed, 8 Sep 2021 00:41:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243701AbhIHAm7 (ORCPT ); Tue, 7 Sep 2021 20:42:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:50512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229946AbhIHAmz (ORCPT ); Tue, 7 Sep 2021 20:42:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E6025610F8; Wed, 8 Sep 2021 00:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631061707; bh=Fl9d5jER6uMrXU9jHladZH9Uwk2Mr6sLfLmbn/RQy/U=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=UTB+ym435pG8mH7eVVt2vO9vk0m5q4ROk1YaYTUchQFO9rVAzejCBB443NvaKoa/c rKgvuHhh5qFB4Q2nCns4YHN50qT9eSyCrfTr5vCm6CRPiz3nbYO6GEJjC7wzOrYLJa YUEjHRGY6z6JXFQHdUcD+rbl2PIcX8SyxEYeowtRj5xXfVqX76uXyH0HzJs2fAyA8R qx+1dV/U6YfJMFYC4e32vGZTiU6mxMNdA2/8/8KFSmrr6WU8aIDYl5MzjtsAzTusj4 t4j1AjKfbIyqnjXoRV6OKLvRk/D+3HDvXWLhK5YmS6lWQqi9rqFkjLjsCP4wGtcYmm pvLVaHVp4CRFQ== Date: Wed, 8 Sep 2021 09:41:45 +0900 From: Masami Hiramatsu To: Steven Rostedt Cc: Punit Agrawal , mhiramat@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RESEND PATCH] tools/bootconfig: Fix a compilation issue with missing variable Message-Id: <20210908094145.babedcd252d8e8caf0e2f2ad@kernel.org> In-Reply-To: <20210907202400.330f4ea4@rorschach.local.home> References: <20210907230710.1189193-1-punitagrawal@gmail.com> <20210907202400.330f4ea4@rorschach.local.home> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; 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, 7 Sep 2021 20:24:00 -0400 Steven Rostedt wrote: > On Wed, 8 Sep 2021 08:07:10 +0900 > Punit Agrawal 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 > > Cc: Masami Hiramatsu > > Cc: Steven Rostedt > > --- > > > > (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