Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Oct 2017 16:21:56 +0000 (09:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Oct 2017 16:21:56 +0000 (09:21 -0700)
commit0de50ea7b5c9e232dcd1cc07c014509c324ff1b8
tree484e28bb828b15e896fa240def13662cbe886cbb
parentbe7484acc6fee2878dc8d1593ba81fb1e0b3d581
parentef8daf8eeb5b8ab6bc356656163d19f20fb827ed
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/livepatching

Pull livepatching fix from Jiri Kosina:

 - bugfix for handling of coming modules (incorrect handling of failure)
   from Joe Lawrence

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: unpatch all klp_objects if klp_module_coming fails