From: Linus Torvalds Date: Fri, 15 Nov 2013 22:08:15 +0000 (-0800) Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild X-Git-Tag: MMI-PSA29.97-13-9~13267 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d72681d7c61f32a89147b8867cfb80e4ea119972;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'kconfig' of git://git./linux/kernel/git/mmarek/kbuild Pull kconfig changes from Michal Marek: - xconfig stores its setting in a meaningful path (~/.config/kernel.org/qconf.conf) - kconfig symbol search fix - documentation fixes - cleanup & comment update - fix warning when a kconfig symbol is defined with two different types - Yann is now officially listed as maintainer of kconfig, but he prefers me to send pull requests for now * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: MAINTAINERS: New kconfig maintainer xconfig: Fix the filename for GUI settings kconfig: fix bug in search results string: use strlen(gstr->s), not gstr->len kconfig: remove unused definition from scanner kconfig: adjust warning message for conflicting types kconfig: fix trivial typos and update mconf documentation kconfig: add short explanation to SYMBOL_WRITE Documentation/kbuild/kconfig.txt: 'make listnewconfig' replaces: yes "" | make oldconfig --- d72681d7c61f32a89147b8867cfb80e4ea119972 diff --cc MAINTAINERS index d2270c070c0f,d083982b5aea..affd429843e4 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -4800,17 -4722,11 +4800,18 @@@ S: Maintaine F: Documentation/hwmon/k8temp F: drivers/hwmon/k8temp.c +KTAP +M: Jovi Zhangwei +W: http://www.ktap.org +L: ktap@freelists.org +S: Maintained +F: drivers/staging/ktap/ + KCONFIG - M: Michal Marek + M: "Yann E. MORIN" L: linux-kbuild@vger.kernel.org - S: Odd Fixes + T: git://gitorious.org/linux-kconfig/linux-kconfig + S: Maintained F: Documentation/kbuild/kconfig-language.txt F: scripts/kconfig/