Commit f4887900 authored by Linus Torvalds's avatar Linus Torvalds

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
parents d2d721e2 61842868
...@@ -173,6 +173,12 @@ extern void cleanup_module(void); ...@@ -173,6 +173,12 @@ extern void cleanup_module(void);
*/ */
#define MODULE_SOFTDEP(_softdep) MODULE_INFO(softdep, _softdep) #define MODULE_SOFTDEP(_softdep) MODULE_INFO(softdep, _softdep)
/*
* Weak module dependencies. See man modprobe.d for details.
* Example: MODULE_WEAKDEP("module-foo")
*/
#define MODULE_WEAKDEP(_weakdep) MODULE_INFO(weakdep, _weakdep)
/* /*
* MODULE_FILE is used for generating modules.builtin * MODULE_FILE is used for generating modules.builtin
* So, make it no-op when this is being built as a module * So, make it no-op when this is being built as a module
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment