From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Oct 2016 19:02:24 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... 
X-Git-Tag: v4.9-rc1~90
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=ddc4e6d232d6b625a5686ec1aafe42b9e0109a4c;p=karo-tx-linux.git

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
---

ddc4e6d232d6b625a5686ec1aafe42b9e0109a4c