• Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param · cab4e4c4
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param:
      module: use strstarts()
      strstarts: helper function for !strncmp(str, prefix, strlen(prefix))
      arm: allow usage of string functions in linux/string.h
      module: don't use stop_machine on module load
      module: create a request_module_nowait()
      module: include other structures in module version check
      module: remove the SHF_ALLOC flag on the __versions section.
      module: clarify the force-loading taint message.
      module: Export symbols needed for Ksplice
      Ksplice: Add functions for walking kallsyms symbols
      module: remove module_text_address()
      module: __module_address
      module: Make find_symbol return a struct kernel_symbol
      kernel/module.c: fix an unused goto label
      param: fix charp parameters set via sysfs
    
    Fix trivial conflicts in kernel/extable.c manually.
    cab4e4c4
extable.c 2.95 KB