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

Merge tag 'kbuild-v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kbuild updates from Masahiro Yamada:
 "This is the last pull request from me.

  I'm grateful to have been able to continue as a maintainer for eight
  years. From the next cycle, Nathan and Nicolas will maintain Kbuild.

   - Fix a shortcut key issue in menuconfig

   - Fix missing rebuild of kheaders

   - Sort the symbol dump generated by gendwarfsyms

   - Support zboot extraction in scripts/extract-vmlinux

   - Migrate gconfig to GTK 3

   - Add TAR variable to allow overriding the default tar command

   - Hand over Kbuild maintainership"

* tag 'kbuild-v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (92 commits)
  MAINTAINERS: hand over Kbuild maintenance
  kheaders: make it possible to override TAR
  kbuild: userprogs: use correct linker when mixing clang and GNU ld
  kconfig: lxdialog: replace strcpy() with strncpy() in inputbox.c
  kconfig: lxdialog: replace strcpy with snprintf in print_autowrap
  kconfig: gconf: refactor text_insert_help()
  kconfig: gconf: remove unneeded variable in text_insert_msg
  kconfig: gconf: use hyphens in signals
  kconfig: gconf: replace GtkImageMenuItem with GtkMenuItem
  kconfig: gconf: Fix Back button behavior
  kconfig: gconf: fix single view to display dependent symbols correctly
  scripts: add zboot support to extract-vmlinux
  gendwarfksyms: order -T symtypes output by name
  gendwarfksyms: use preferred form of sizeof for allocation
  kconfig: qconf: confine {begin,end}Group to constructor and destructor
  kconfig: qconf: fix ConfigList::updateListAllforAll()
  kconfig: add a function to dump all menu entries in a tree-like format
  kconfig: gconf: show GTK version in About dialog
  kconfig: gconf: replace GtkHPaned and GtkVPaned with GtkPaned
  kconfig: gconf: replace GdkColor with GdkRGBA
  ...
parents 7881cd68 8d6841d5

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -4378,6 +4378,12 @@ S: 542 West 112th Street, 5N 
S: New York, New York 10025

S: USA



N: Masahiro Yamada

E: masahiroy@kernel.org

D: Kbuild Maintainer 2017-2025

D: Kconfig Maintainer 2018-2025

S: Japan



N: Li Yang

E: leoli@freescale.com

D: Freescale Highspeed USB device driver

Documentation/kbuild/kconfig.rst

+4 −4
Original line number Diff line number Diff line
@@ -67,12 +67,12 @@ Environment variables for ``*config``: 
    with its value when saving the configuration, instead of using the

    default, ``CONFIG_``.



Environment variables for ``{allyes/allmod/allno/rand}config``:

Environment variables for ``{allyes/allmod/allno/alldef/rand}config``:



``KCONFIG_ALLCONFIG``

    The allyesconfig/allmodconfig/allnoconfig/randconfig variants can also

    use the environment variable KCONFIG_ALLCONFIG as a flag or a filename

    that contains config symbols that the user requires to be set to a

    The allyesconfig/allmodconfig/alldefconfig/allnoconfig/randconfig variants

    can also use the environment variable KCONFIG_ALLCONFIG as a flag or a

    filename that contains config symbols that the user requires to be set to a

    specific value.  If KCONFIG_ALLCONFIG is used without a filename where

    KCONFIG_ALLCONFIG == "" or KCONFIG_ALLCONFIG == "1", ``make *config``

    checks for a file named "all{yes/mod/no/def/random}.config"

MAINTAINERS

+5 −8
Original line number Diff line number Diff line
@@ -13174,11 +13174,9 @@ F: mm/kasan/ 
F:	scripts/Makefile.kasan









KCONFIG









M:	Masahiro Yamada <masahiroy@kernel.org>









L:	linux-kbuild@vger.kernel.org









S:	Maintained









S:	Orphan









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









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









F:	Documentation/kbuild/kconfig*









F:	scripts/Kconfig.include









F:	scripts/kconfig/








@@ -13243,13 +13241,12 @@ S:	Maintained







F:	fs/autofs/

















KERNEL BUILD + files below scripts/ (unless maintained elsewhere)









M:	Masahiro Yamada <masahiroy@kernel.org>









R:	Nathan Chancellor <nathan@kernel.org>









R:	Nicolas Schier <nicolas@fjasle.eu>









M:	Nathan Chancellor <nathan@kernel.org>









M:	Nicolas Schier <nicolas@fjasle.eu>









L:	linux-kbuild@vger.kernel.org









S:	Maintained









S:	Odd Fixes









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









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









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









F:	Documentation/kbuild/









F:	Makefile









F:	scripts/*vmlinux*
































Makefile



+3
−2






























Original line number
Diff line number
Diff line







@@ -549,6 +549,7 @@ LZMA		= lzma







LZ4		= lz4









XZ		= xz









ZSTD		= zstd









TAR		= tar



















CHECKFLAGS     := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \









		  -Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)








@@ -628,7 +629,7 @@ export RUSTC RUSTDOC RUSTFMT RUSTC_OR_CLIPPY_QUIET RUSTC_OR_CLIPPY BINDGEN







export HOSTRUSTC KBUILD_HOSTRUSTFLAGS









export CPP AR NM STRIP OBJCOPY OBJDUMP READELF PAHOLE RESOLVE_BTFIDS LEX YACC AWK INSTALLKERNEL









export PERL PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX









export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD









export KGZIP KBZIP2 KLZOP LZMA LZ4 XZ ZSTD TAR









export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS KBUILD_PROCMACROLDFLAGS LDFLAGS_MODULE









export KBUILD_USERCFLAGS KBUILD_USERLDFLAGS


















@@ -1141,7 +1142,7 @@ KBUILD_USERCFLAGS  += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD







KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))



















# userspace programs are linked via the compiler, use the correct linker









ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy)









ifdef CONFIG_CC_IS_CLANG









KBUILD_USERLDFLAGS += --ld-path=$(LD)









endif










































include/crypto/algapi.h



+2
−2






























Original line number
Diff line number
Diff line







@@ -43,8 +43,8 @@







 * alias.









 */









#define MODULE_ALIAS_CRYPTO(name)	\









		__MODULE_INFO(alias, alias_userspace, name);	\









		__MODULE_INFO(alias, alias_crypto, "crypto-" name)









		MODULE_INFO(alias, name);	\









		MODULE_INFO(alias, "crypto-" name)



















struct crypto_aead;









struct crypto_instance;