Commit cb7f9fc3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux 

Pull Kbuild fixes from Nathan Chancellor:

 - Formally adopt Kconfig in MAINTAINERS

 - Fix install-extmod-build for more O= paths

 - Align end of .modinfo to fix Authenticode calculation in EDK2

 - Restore dynamic check for '-fsanitize=kernel-memory' in
   CONFIG_HAVE_KMSAN_COMPILER to ensure backend target has support
   for it

 - Initialize locale in menuconfig and nconfig to fix UTF-8 terminals
   that may not support VT100 ACS by default like PuTTY

* tag 'kbuild-fixes-6.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux:
  kconfig/nconf: Initialize the default locale at startup
  kconfig/mconf: Initialize the default locale at startup
  KMSAN: Restore dynamic check for '-fsanitize=kernel-memory'
  kbuild: align modinfo section for Secureboot Authenticode EDK2 compat
  kbuild: install-extmod-build: Fix when given dir outside the build dir
  MAINTAINERS: Update Kconfig section
parents ba36dd5e 43c2931a

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -13425,9 +13425,12 @@ F: mm/kasan/ 
F:	scripts/Makefile.kasan









KCONFIG









M:	Nathan Chancellor <nathan@kernel.org>









M:	Nicolas Schier <nsc@kernel.org>









L:	linux-kbuild@vger.kernel.org









S:	Orphan









S:	Odd Fixes









Q:	https://patchwork.kernel.org/project/linux-kbuild/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git









F:	Documentation/kbuild/kconfig*









F:	scripts/Kconfig.include









F:	scripts/kconfig/
































include/asm-generic/vmlinux.lds.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -832,7 +832,7 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG)

















/* Required sections not related to debugging. */









#define ELF_DETAILS							\









		.modinfo : { *(.modinfo) }				\









		.modinfo : { *(.modinfo) . = ALIGN(8); }		\









		.comment 0 : { *(.comment) }				\









		.symtab 0 : { *(.symtab) }				\









		.strtab 0 : { *(.strtab) }				\
































lib/Kconfig.kmsan



+1
−1






























Original line number
Diff line number
Diff line







@@ -3,7 +3,7 @@ config HAVE_ARCH_KMSAN







	bool



















config HAVE_KMSAN_COMPILER









	def_bool CC_IS_CLANG









	def_bool $(cc-option,-fsanitize=kernel-memory)



















config KMSAN









	bool "KMSAN: detector of uninitialized values use"
































scripts/kconfig/mconf.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -12,6 +12,7 @@







#include <errno.h>









#include <fcntl.h>









#include <limits.h>









#include <locale.h>









#include <stdarg.h>









#include <stdlib.h>









#include <string.h>








@@ -931,6 +932,8 @@ int main(int ac, char **av)

















	signal(SIGINT, sig_handler);



















	setlocale(LC_ALL, "");



















	if (ac > 1 && strcmp(av[1], "-s") == 0) {









		silent = 1;









		/* Silence conf_read() until the real callback is set up */
































scripts/kconfig/nconf.c



+3
−0






























Original line number
Diff line number
Diff line







@@ -7,6 +7,7 @@







#ifndef _GNU_SOURCE









#define _GNU_SOURCE









#endif









#include <locale.h>









#include <string.h>









#include <strings.h>









#include <stdlib.h>








@@ -1478,6 +1479,8 @@ int main(int ac, char **av)







	int lines, columns;









	char *mode;



















	setlocale(LC_ALL, "");



















	if (ac > 1 && strcmp(av[1], "-s") == 0) {









		/* Silence conf_read() until the real callback is set up */









		conf_set_message_callback(NULL);