Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatchin...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 May 2019 15:56:04 +0000 (08:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 May 2019 15:56:04 +0000 (08:56 -0700)
commit573de2a6e844cb230c4483833f29b8344a6a17cc
tree98dd321fc5b6dd9f4b6bf1bcaa6cb6f4a663301f
parentb4dd05dee0dbd16afdbba83b698a7110c687be2d
parent1efbd99ed41db9ddc3ae7e189934c62e9dbe55c4
Merge branch 'for-linus' of git://git./linux/kernel/git/livepatching/livepatching

Pull livepatching updates from Jiri Kosina:

 - livepatching kselftests improvements from Joe Lawrence and Miroslav
   Benes

 - making use of gcc's -flive-patching option when available, from
   Miroslav Benes

 - kobject handling cleanups, from Petr Mladek

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
  livepatch: Remove duplicated code for early initialization
  livepatch: Remove custom kobject state handling
  livepatch: Convert error about unsupported reliable stacktrace into a warning
  selftests/livepatch: Add functions.sh to TEST_PROGS_EXTENDED
  kbuild: use -flive-patching when CONFIG_LIVEPATCH is enabled
  selftests/livepatch: use TEST_PROGS for test scripts
Makefile