merge_config.sh: fix bug in final check
authorJohn Stultz <john.stultz@linaro.org>
Tue, 10 Jan 2012 23:41:15 +0000 (15:41 -0800)
committerMichal Marek <mmarek@suse.cz>
Sat, 14 Jan 2012 20:44:29 +0000 (21:44 +0100)
commit320d41bb1597799669bab28a047f9868dd754aca
tree59b4a7493eea8ae29015c5421717f2ac326e124b
parentc0c0cda276b796e9c9710672b3bb4a737dbb4900
merge_config.sh: fix bug in final check

Arnaud Lacombe pointed out the final checking that the requested configs
were included in the final .config was broken.

The example was that if you had a fragment that disabled
CONFIG_DECOMPRESS_GZIP applied to a normal defconfig, there would be no
final warning that CONFIG_DECOMPRESS_GZIP was acutally set in the final
.config.

This bug was introduced by me in v3 of the original patch, and the
following patch reverts the invalid change.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Reported-by: Arnaud Lacombe <lacombar@gmail.com>
Cc: Darren Hart <dvhart@linux.intel.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Arnaud Lacombe <lacombar@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
scripts/kconfig/merge_config.sh