From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Aug 2025 04:32:52 +0000 (+0300)
Subject: Merge tag 'kbuild-v6.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a530a36bb548bbd441402b736f17339183ff53fd;p=thirdparty%2Fkernel%2Flinux.git

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
  ...
---

a530a36bb548bbd441402b736f17339183ff53fd
diff --cc include/linux/moduleparam.h
index a04a2bc4f51e3,00166f747e278..3a25122d83e28
--- a/include/linux/moduleparam.h
+++ b/include/linux/moduleparam.h
@@@ -24,8 -17,12 +24,9 @@@
  #define __MODULE_INFO_PREFIX KBUILD_MODNAME "."
  #endif
  
- #define __MODULE_INFO(tag, name, info)					  \
- 	static const char __UNIQUE_ID(name)[]				  \
 -/* Chosen so that structs with an unsigned long line up. */
 -#define MAX_PARAM_PREFIX_LEN (64 - sizeof(unsigned long))
 -
+ /* Generic info of form tag = "info" */
+ #define MODULE_INFO(tag, info)					  \
+ 	static const char __UNIQUE_ID(modinfo)[]			  \
  		__used __section(".modinfo") __aligned(1)		  \
  		= __MODULE_INFO_PREFIX __stringify(tag) "=" info