[GIT PULL] Kbuild fixes for 7.0 #3

From: Nathan Chancellor

Date: Tue Mar 24 2026 - 17:13:06 EST


Hi Linus,

Please pull this third round of Kbuild fixes for 7.0, mostly addressing
some issues with the awk conversion in scripts/kconfig/merge_config.sh.
If there are any problems, please let me know.

Cheers,
Nathan

The following changes since commit 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681:

Linux 7.0-rc3 (2026-03-08 16:56:54 -0700)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git tags/kbuild-fixes-7.0-3

for you to fetch changes up to 775af5cbb22c1de2ad0f486959739c35cfc55ac8:

scripts: kconfig: merge_config.sh: fix indentation (2026-03-11 00:38:06 -0700)

----------------------------------------------------------------
Third round of Kbuild fixes for 7.0

- Fix typo to ensure .builtin-dtbs.S is properly cleaned

- Fix '==' bashism in scripts/kconfig/merge_config.sh

- Fix awk error in scripts/kconfig/merge_config.sh when base
configuration is empty

- Fix inconsistent indentation in scripts/kconfig/merge_config.sh

Signed-off-by: Nathan Chancellor <nathan@xxxxxxxxxx>

----------------------------------------------------------------
Charles Mirabile (1):
kbuild: Delete .builtin-dtbs.S when running make clean

Daniel Gomez (2):
scripts: kconfig: merge_config.sh: pass output file as awk variable
scripts: kconfig: merge_config.sh: fix indentation

Weizhao Ouyang (1):
scripts: kconfig: merge_config.sh: fix unexpected operator warning

Makefile | 2 +-
scripts/kconfig/merge_config.sh | 24 ++++++++++--------------
2 files changed, 11 insertions(+), 15 deletions(-)