diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 10:15:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 10:15:34 -0700 |
| commit | 9497d7380b9c450830190c75aa43b25c278bb1f9 (patch) | |
| tree | 019fe8a45676f873bf03746a671cc04bcc4512b0 /kernel/trace | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial (diff) | |
| parent | Merge branch 'for-4.1/core-s390' into for-linus (diff) | |
| download | linux-dev-9497d7380b9c450830190c75aa43b25c278bb1f9.tar.xz linux-dev-9497d7380b9c450830190c75aa43b25c278bb1f9.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching updates from Jiri Kosina:
"These are mostly smaller things that got accumulated during the
development cycle. The unified solution is still being worked on and
is not mature enough for 4.1 yet.
- s390 livepatching support, from Jiri Slaby (has Ack from s390
maintainers)
- error handling simplification, from Josh Poimboeuf
- two minor code cleanups from Josh Poimboeuf and Miroslav Benes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
livepatch: add support on s390
livepatch: remove unnecessary call to klp_find_object_module()
livepatch: simplify disable error path
livepatch: remove extern specifier from header files
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions