From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Mar 2026 23:48:14 +0000 (-0700)
Subject: Merge tag 'kbuild-fixes-7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuil... 
X-Git-Tag: v7.0-rc6~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbeb83d3182abe0d245318e274e8531e5dd7a948;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'kbuild-fixes-7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux

Pull Kbuild fixes from Nathan Chancellor:
 "This mostly addresses some issues with the awk conversion in
  scripts/kconfig/merge_config.sh.

   - 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"

* tag 'kbuild-fixes-7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux:
  scripts: kconfig: merge_config.sh: fix indentation
  scripts: kconfig: merge_config.sh: pass output file as awk variable
  scripts: kconfig: merge_config.sh: fix unexpected operator warning
  kbuild: Delete .builtin-dtbs.S when running make clean
---

bbeb83d3182abe0d245318e274e8531e5dd7a948