Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 0b86c75d
    Linus Torvalds authored
    Pull livepatching updates from Jiri Kosina:
    
     - remove of our own implementation of architecture-specific relocation
       code and leveraging existing code in the module loader to perform
       arch-dependent work, from Jessica Yu.
    
       The relevant patches have been acked by Rusty (for module.c) and
       Heiko (for s390).
    
     - live patching support for ppc64le, which is a joint work of Michael
       Ellerman and Torsten Duwe.  This is coming from topic branch that is
       share between livepatching.git and ppc tree.
    
     - addition of livepatching documentation from Petr Mladek
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
      livepatch: make object/func-walking helpers more robust
      livepatch: Add some basic livepatch documentation
      powerpc/livepatch: Add live patching support on ppc64le
      powerpc/livepatch: Add livepatch stack to struct thread_info
      powerpc/livepatch: Add livepatch header
      livepatch: Allow architectures to specify an alternate ftrace location
      ftrace: Make ftrace_location_range() global
      livepatch: robustify klp_register_patch() API error checking
      Documentation: livepatch: outline Elf format and requirements for patch modules
      livepatch: reuse module loader code to write relocations
      module: s390: keep mod_arch_specific for livepatch modules
      module: preserve Elf information for livepatch modules
      Elf: add livepatch-specific Elf constants
    0b86c75d