From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Oct 2012 01:28:52 +0000 (+0900)
Subject: Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
X-Git-Tag: v3.7-rc1~46
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=35e9a274fdc9c8feb763e4970a32d7089f51393c;hp=-c

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

Pull kconfig changes from Michal Marek:
 "kconfig in v3.7 is going to
   - initialize ncurses only once in menuconfig
   - be able to jump to a search result in menuconfig
   - change the misnomer oldnoconfig to a more meaningful name
     olddefconfig, keeping the old name as alias"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as an alias
  menuconfig: Assign jump keys per-page instead of globally
  menuconfig: Do not open code textbox scroll up/down
  menuconfig: Add jump keys to search results
  menuconfig: Extend dialog_textbox so that it can return to a scrolled position
  menuconfig: Extend dialog_textbox so that it can exit on arbitrary keypresses
  menuconfig: Remove superfluous conditionnal
  kconfig: document oldnoconfig to what it really does in conf.c
  kconfig/mconf.c: revision of curses initialization.
---

35e9a274fdc9c8feb763e4970a32d7089f51393c
diff --combined tools/testing/ktest/ktest.pl
index c05bcd293d8c,0ed73b5ebbfc..b51d787176d3
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@@ -840,9 -840,7 +840,9 @@@ sub __read_config 
  
  		if ($rest =~ /\sIF\s+(.*)/) {
  		    # May be a ELSE IF section.
 -		    if (!process_if($name, $1)) {
 +		    if (process_if($name, $1)) {
 +			$if_set = 1;
 +		    } else {
  			$skip = 1;
  		    }
  		    $rest = "";
@@@ -1873,10 -1871,10 +1873,10 @@@ sub make_oldconfig 
  	apply_min_config;
      }
  
-     if (!run_command "$make oldnoconfig") {
- 	# Perhaps oldnoconfig doesn't exist in this version of the kernel
+     if (!run_command "$make olddefconfig") {
+ 	# Perhaps olddefconfig doesn't exist in this version of the kernel
  	# try a yes '' | oldconfig
- 	doprint "oldnoconfig failed, trying yes '' | make oldconfig\n";
+ 	doprint "olddefconfig failed, trying yes '' | make oldconfig\n";
  	run_command "yes '' | $make oldconfig" or
  	    dodie "failed make config oldconfig";
      }
@@@ -1929,7 -1927,7 +1929,7 @@@ sub build 
  
      # old config can ask questions
      if ($type eq "oldconfig") {
- 	$type = "oldnoconfig";
+ 	$type = "olddefconfig";
  
  	# allow for empty configs
  	run_command "touch $output_config";
@@@ -1959,7 -1957,7 +1959,7 @@@
  	load_force_config($minconfig);
      }
  
-     if ($type ne "oldnoconfig") {
+     if ($type ne "olddefconfig") {
  	run_command "$make $type" or
  	    dodie "failed make config";
      }
@@@ -2458,8 -2456,7 +2458,7 @@@ my %config_set
  
  # config_off holds the set of configs that the bad config had disabled.
  # We need to record them and set them in the .config when running
- # oldnoconfig, because oldnoconfig does not turn off new symbols, but
- # instead just keeps the defaults.
+ # olddefconfig, because olddefconfig keeps the defaults.
  my %config_off;
  
  # config_off_tmp holds a set of configs to turn off for now
@@@ -3250,7 -3247,7 +3249,7 @@@ sub test_this_config 
      }
  
      # Remove this config from the list of configs
-     # do a make oldnoconfig and then read the resulting
+     # do a make olddefconfig and then read the resulting
      # .config to make sure it is missing the config that
      # we had before
      my %configs = %min_configs;