Skip to content

Commit f488790

Browse files
committed
Merge tag 'modules-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux
Pull module update from Luis Chamberlain: "This is a super boring development cycle this time around for modules, there is only one patch in this pull request. The patch deals with a corner case set of dependencies which is not resolved today to ensure users get the module they need on initramfs. Currently only one module is known to exist which needs this, however this can grow to capture other corner cases likely escaped and not reported before. The kernel change is just a section update, the real work is done and merged already on upstream kmod. This has been on linux-next for 3 weeks now" * tag 'modules-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux: module: create weak dependecies
2 parents d2d721e + 6184286 commit f488790

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

include/linux/module.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,12 @@ extern void cleanup_module(void);
173173
*/
174174
#define MODULE_SOFTDEP(_softdep) MODULE_INFO(softdep, _softdep)
175175

176+
/*
177+
* Weak module dependencies. See man modprobe.d for details.
178+
* Example: MODULE_WEAKDEP("module-foo")
179+
*/
180+
#define MODULE_WEAKDEP(_weakdep) MODULE_INFO(weakdep, _weakdep)
181+
176182
/*
177183
* MODULE_FILE is used for generating modules.builtin
178184
* So, make it no-op when this is being built as a module

0 commit comments

Comments
 (0)