diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 17:08:15 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 17:08:15 -0500 |
commit | d72681d7c61f32a89147b8867cfb80e4ea119972 (patch) | |
tree | 2a83f714290065a9696d59f9f286887f134cfbe7 /Documentation | |
parent | 762fb1ddd561aac5b14afac19287672b99242811 (diff) | |
parent | e125096e733e966e055ee6033169f68233f9bf9c (diff) |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kbuild/kconfig.txt | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt index 8ef6dbb6a462..bbc99c0c1094 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt | |||
@@ -20,16 +20,9 @@ symbols have been introduced. | |||
20 | To see a list of new config symbols when using "make oldconfig", use | 20 | To see a list of new config symbols when using "make oldconfig", use |
21 | 21 | ||
22 | cp user/some/old.config .config | 22 | cp user/some/old.config .config |
23 | yes "" | make oldconfig >conf.new | 23 | make listnewconfig |
24 | 24 | ||
25 | and the config program will list as (NEW) any new symbols that have | 25 | and the config program will list any new symbols, one per line. |
26 | unknown values. Of course, the .config file is also updated with | ||
27 | new (default) values, so you can use: | ||
28 | |||
29 | grep "(NEW)" conf.new | ||
30 | |||
31 | to see the new config symbols or you can use diffconfig to see the | ||
32 | differences between the previous and new .config files: | ||
33 | 26 | ||
34 | scripts/diffconfig .config.old .config | less | 27 | scripts/diffconfig .config.old .config | less |
35 | 28 | ||