Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jun 2017 15:59:17 +0000 (08:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Jun 2017 15:59:17 +0000 (08:59 -0700)
commit035f1456f9ed256cd1a92ae1b81cc24413359e61
tree8cadc5b6dae613b4947b70a231a600707e3be709
parentf2a025defd804be938f8acffe62e4801a3ed1601
parent5720acf4bfc142ba568d5b6782fceaf62ed15e0b
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/livepatching

Pull livepatching fix from Jiri Kosina:
 "Kconfig dependency fix for livepatching infrastructure from Miroslav
  Benes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: Make livepatch dependent on !TRIM_UNUSED_KSYMS