From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Jun 2020 19:07:28 +0000 (-0700)
Subject: Merge tag 'kconfig-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: v5.10.7~2414
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b170290c2836c40ab565736ba37681eb3dfd79b8;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'kconfig-v5.8' of git://git./linux/kernel/git/masahiroy/linux-kbuild

Pull Kconfig updates from Masahiro Yamada:

 - allow only 'config', 'comment', 'if' statements inside 'choice' since
   the other statements are not sensible inside 'choice' and should be
   grammatical error

 - support LMC_KEEP env variable for 'make local{yes,mod}config' to
   preserve some CONFIG options

 - deprecate 'make kvmconfig' and 'make xenconfig' in favor of
   'make kvm_guest.config' and 'make xen.config'

 - code cleanups

* tag 'kconfig-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: announce removal of 'kvmconfig' and 'xenconfig' shorthands
  streamline_config.pl: add LMC_KEEP to preserve some kconfigs
  kconfig: allow only 'config', 'comment', and 'if' inside 'choice'
  kconfig: tests: remove randconfig test for choice in choice
  kconfig: do not assign a variable in the return statement
  kconfig: do not use OR-assignment for zero-cleared structure
---

b170290c2836c40ab565736ba37681eb3dfd79b8