From nobody Thu Apr 9 08:10:45 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 53FE63876AA; Tue, 10 Mar 2026 11:37:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773142634; cv=none; b=trDHdOTDtN3myzhwlkD+TZ7mZ61yZB/Yy4pUzXpcgA1nEncO/9MR30XB/9Jcf0ucsZrIHyezrJZ3RTvHXzO0qvNwb9YIRPOKjGPGKEWGvEASdmmaWZQll6fXurnAuQWtyMr3+3S4frh5wCK1J4oE4O3kYtfTXXjIOAWMVQA71Pg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773142634; c=relaxed/simple; bh=0bj5d9f6ym9FJ+OReOB54vFmb0AkNLiq2D2tBlOvEwk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tMIvciBtBcQ+yHzcrHMcKvFzE2CPVirVres/V2MUnkylAcwx8/HsZUSeN81qLEUuSu1vM0mdFqjWfcIrO3sUstYZZBYyX1nPLQHZTvXhJXgmol7wJqWSrOiA+PiINtM6YQTLdGlAk7TrNU7KiQjOvCPMSCzQs9CM0krcNH/LK/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kNzlY0PR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kNzlY0PR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68BDAC2BC86; Tue, 10 Mar 2026 11:37:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773142634; bh=0bj5d9f6ym9FJ+OReOB54vFmb0AkNLiq2D2tBlOvEwk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kNzlY0PRK+dkPvh3y+g/Dr1+Kh2jUWlrJ86kOKKX4KXvOJzH/GHSkQV9BG1mNJfpB XhIt2iZQWZVnIXgzLnLayy3xRXTQVshk5WakbRR9uZwNMm3DGUwA3EcqQFBxRgM/6y eMr62+M6lael8/pxQNLZJus3XU5ujfQgXAAidELK9MM2pqB6HuH958w8smx5cLjKPU bm/oyGubmPhqVpdiewNYG/4W5CMZobV66Pd04WX953Q6e76QsTSSehwprhkcNDhKuw //WEpG17FEczWRpy4bX8v+7cwXwWu9/GzKSxx/1xH7smH1LpcnJnNoQH8+bXaCy7lx iOSehKoMRapnw== From: Daniel Gomez Date: Tue, 10 Mar 2026 12:36:24 +0100 Subject: [PATCH 2/3] scripts: kconfig: merge_config.sh: fix indentation Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260310-fixes-merge-config-v1-2-beaeeaded6bd@samsung.com> References: <20260310-fixes-merge-config-v1-0-beaeeaded6bd@samsung.com> In-Reply-To: <20260310-fixes-merge-config-v1-0-beaeeaded6bd@samsung.com> To: Nathan Chancellor , Nicolas Schier , Anders Roxell , Mikko Rapeli Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Gomez X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=1005; i=da.gomez@samsung.com; h=from:subject:message-id; bh=d5vITWBHq6v9qCIXJuZ30MqhqknOFbXBTslC4NVtlyc=; b=owEBbQKS/ZANAwAIAUCeo8QfGVH7AcsmYgBpsAJhaQRn76KhPBrrai3CoYFnwfwcl6O/QSgNq ZW683PfIuWJAjMEAAEIAB0WIQTvdRrhHw9z4bnGPFNAnqPEHxlR+wUCabACYQAKCRBAnqPEHxlR +5cVEACA/gfduascW8mWJW0ktK8ASwKZlRzE3LrQ6937Xs398fhyUhj2Nb1SdT7E5E0b3PuJ0AR xj51BdCvw0ryTi2DQj2wURoGAVtS5gt/yNncg0oy4tXG4U64yrXMziW19REROUCVXqU9k3LUfOR iyrhblTOSlvdQaxYo8Y00ukj5JIyBAOIuz6O0UY96/fTiTm1SmkLErzQ9FvTJmKdzu0s0zCXk6/ 3NGUXt9dPjPwNK8ga1QzAZSHolbiBfoHkBw7kIAecPwIh6BCrP9SUlXjj5GSe2DORsrW2Hx3AvI 3+gZ+PpW98OXM7NdsucsTG0MhjgA0T4i5WG0qozPVLUsSwWKKoEqCFO2Hi5GmcD4BfVfHz7h3If CuQXg2RHUZvbdrGarJT8hZ+pgRD1P6L9UFuT/5y3KVzXJ6VHeW02ynmUioHy9Md0Gjzg4h3Qxv/ lgcieGeBowy1x2MU4XKBlwZuPsLNmfbTj0Xpi7m8cnvWl25/gCIZFkqxaV9MlWgWHvvPGjbJl6T /ceXOzVTPJ6EUANR03wdBNQJzjZZjKha9f5ZS2n+WixmINamlOlOsg/h4l3uqW+hdal+1PeGeg2 ygsY3rpPtF59UjZipuOmfvqPeJ3WIXIyrGM+gEVkteejiyF9uI0I7RR9I4eqHXosajUAyJFNDxP gWZf63HJeQHc0mw== X-Developer-Key: i=da.gomez@samsung.com; a=openpgp; fpr=B2A7A9CFDD03B540FF58B27185F56EA4E9E8138F From: Daniel Gomez Replace spaces with tabs for consistency with the rest of the script. Fixes: 5fa9b82cbcfc5 ("scripts: kconfig: merge_config.sh: refactor from she= ll/sed/grep to awk") Signed-off-by: Daniel Gomez --- scripts/kconfig/merge_config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config= .sh index 5177bde69c1d..95f090b88e8d 100755 --- a/scripts/kconfig/merge_config.sh +++ b/scripts/kconfig/merge_config.sh @@ -196,7 +196,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do =20 # First pass: read merge file, store all lines and index FILENAME =3D=3D ARGV[1] { - mergefile =3D FILENAME + mergefile =3D FILENAME merge_lines[FNR] =3D $0 merge_total =3D FNR cfg =3D get_cfg($0) @@ -217,7 +217,7 @@ for ORIG_MERGE_FILE in $MERGE_LIST ; do next } =20 - prev_val =3D $0 + prev_val =3D $0 new_val =3D merge_cfg[cfg] =20 # BUILTIN: do not demote y to m --=20 2.53.0