From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Nov 2018 17:47:33 +0000 (-0700)
Subject: Merge tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: v5.4-rc1~2264
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9a12efc5e01ac1dbad089f22e5d0e6f817970c3c;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'kbuild-v4.20-2' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild updates from Masahiro Yamada:

 - clean-up leftovers in Kconfig files

 - remove stale oldnoconfig and silentoldconfig targets

 - remove unneeded cc-fullversion and cc-name variables

 - improve merge_config script to allow overriding option prefix

* tag 'kbuild-v4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: remove cc-name variable
  kbuild: replace cc-name test with CONFIG_CC_IS_CLANG
  merge_config.sh: Allow to define config prefix
  kbuild: remove unused cc-fullversion variable
  kconfig: remove silentoldconfig target
  kconfig: remove oldnoconfig target
  powerpc: PCI_MSI needs PCI
  powerpc: remove CONFIG_MCA leftovers
  powerpc: remove CONFIG_PCI_QSPAN
  scsi: aha152x: rename the PCMCIA define
---

9a12efc5e01ac1dbad089f22e5d0e6f817970c3c