tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kconfig: drop the ""trying to assign nonexistent symbol" warning
kconfig: always write out .config

Linus Torvalds d8f4b819 115a326c

+3 -7
unified split
+1 -1
scripts/kconfig/conf.c
··· 596 break; 597 } 598 599 - if (conf_get_changed() && conf_write(NULL)) { 600 fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); 601 exit(1); 602 }
··· 596 break; 597 } 598 599 + if (conf_write(NULL)) { 600 fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n")); 601 exit(1); 602 }
+2 -6
scripts/kconfig/confdata.c
··· 222 continue; 223 if (def == S_DEF_USER) { 224 sym = sym_find(line + 9); 225 - if (!sym) { 226 - conf_warning("trying to assign nonexistent symbol %s", line + 9); 227 break; 228 - } 229 } else { 230 sym = sym_lookup(line + 9, 0); 231 if (sym->type == S_UNKNOWN) ··· 259 } 260 if (def == S_DEF_USER) { 261 sym = sym_find(line + 7); 262 - if (!sym) { 263 - conf_warning("trying to assign nonexistent symbol %s", line + 7); 264 break; 265 - } 266 } else { 267 sym = sym_lookup(line + 7, 0); 268 if (sym->type == S_UNKNOWN)
··· 222 continue; 223 if (def == S_DEF_USER) { 224 sym = sym_find(line + 9); 225 + if (!sym) 226 break; 227 } else { 228 sym = sym_lookup(line + 9, 0); 229 if (sym->type == S_UNKNOWN) ··· 261 } 262 if (def == S_DEF_USER) { 263 sym = sym_find(line + 7); 264 + if (!sym) 265 break; 266 } else { 267 sym = sym_lookup(line + 7, 0); 268 if (sym->type == S_UNKNOWN)