]> git.karo-electronics.de Git - karo-tx-linux.git/commit
merge_config.sh: fix bug in final check
authorJohn Stultz <john.stultz@linaro.org>
Thu, 8 Dec 2011 04:33:14 +0000 (15:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:43:03 +0000 (17:43 +1100)
commit4a27b68149628503a9f0db98e7a07402b8fa48e0
tree16a73546a0888cf5da1780ad07977f7f9fb4d4bb
parenta938123a67f3052b1d178ccb4167447a158fdfaf
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>
scripts/kconfig/merge_config.sh