tree 53f865760ca450fdb1789377516053980d96a837
parent bc75450cc3db3485db1e289fef8c1028ba38296a
parent 2992ef29ae01af998399d55ed7c692a2505fb8af
author Linus Torvalds <torvalds@linux-foundation.org> 1475866944 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1475866944 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

Pull livepatching updates from Jiri Kosina:

 - fix for patching modules that contain .altinstructions or
   .parainstructions sections, from Jessica Yu

 - make TAINT_LIVEPATCH a per-module flag (so that it's immediately
   clear which module caused the taint), from Josh Poimboeuf

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch/module: make TAINT_LIVEPATCH module-specific
  Documentation: livepatch: add section about arch-specific code
  livepatch/x86: apply alternatives and paravirt patches after relocations
  livepatch: use arch_klp_init_object_loaded() to finish arch-specific tasks