tree aabc84ca1c77a15500b75eae417f1026fb13bb39
parent 24f9515de8778410e4b84c85b196c9850d2c1e18
parent 775af5cbb22c1de2ad0f486959739c35cfc55ac8
author Linus Torvalds <torvalds@linux-foundation.org> 1774396094 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1774396094 -0700
mergetag object 775af5cbb22c1de2ad0f486959739c35cfc55ac8
 type commit
 tag kbuild-fixes-7.0-3
 tagger Nathan Chancellor <nathan@kernel.org> 1774385969 -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@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQR74yXHMTGczQHYypIdayaRccAalgUCacL9RwAKCRAdayaRccAa
 lnpJAP9h7iW5/MGjLt8ErvH0a5CrHEZRqJUEqQfJa1haYa6gxwD+NnREu4V5YetJ
 xVoqHLpD/A26xGCmkuMxWasZ156LOQY=
 =8CH+
 -----END PGP SIGNATURE-----

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