From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 May 2012 17:37:56 +0000 (-0700)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~13177
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=da85d3426f52b3728671b1b1a67c6bed16915c0e;p=mirror_ubuntu-zesty-kernel.git

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull kconfig changes from Michal Marek:

 - Error handling for make KCONFIG_ALLCONFIG=<...> all*config plus a fix
   for a bug that was exposed by this

 - Fix for the script/config utility.

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  scripts/config: properly report and set string options
  kbuild: all{no,yes,mod,def,rand}config only read files when instructed to.
  kconfig: Add error handling to KCONFIG_ALLCONFIG
---

da85d3426f52b3728671b1b1a67c6bed16915c0e