From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 18 Jul 2021 18:10:30 +0000 (-0700)
Subject: Merge tag 'kbuild-fixes-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masah... 
X-Git-Tag: v5.15~692
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6750691a82ad264dff140a7e9ca8f340729431f0;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'kbuild-fixes-v5.14' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - Restore the original behavior of scripts/setlocalversion when
   LOCALVERSION is set to empty.

 - Show Kconfig prompts even for 'make -s'

 - Fix the combination of COFNIG_LTO_CLANG=y and CONFIG_MODVERSIONS=y
   for older GNU Make versions

* tag 'kbuild-fixes-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  Documentation: Fix intiramfs script name
  Kbuild: lto: fix module versionings mismatch in GNU make 3.X
  kbuild: do not suppress Kconfig prompts for silent build
  scripts/setlocalversion: fix a bug when LOCALVERSION is empty
---

6750691a82ad264dff140a7e9ca8f340729431f0