summary refs log tree commit diff
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-23 14:07:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-23 14:07:26 -0700
commit0faef837e431b4984652f4a14d2075bed108a04d (patch)
tree8fae7d48b875190487b94878e55d34be447392b7 /drivers/usb/serial
parent67db8a8086e9b865533348954f5547f1e433101e (diff)
parent110c146645140636995c3cf6c6d782008ff67ce8 (diff)
downloadlinux-0faef837e431b4984652f4a14d2075bed108a04d.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fixes from Jiri Kosina:

 - symbol lookup locking fix, from Miroslav Benes

 - error handling improvements in case of failure of the module coming
   notifier, from Minfei Huang

 - we were too pessimistic when kASLR has been enabled on x86 and were
   dropping address hints on the floor unnecessarily in such case.  Fix
   from Jiri Kosina

 - a few other small fixes and cleanups

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: add module locking around kallsyms calls
  livepatch: annotate klp_init() with __init
  livepatch: introduce patch/func-walking helpers
  livepatch: make kobject in klp_object statically allocated
  livepatch: Prevent patch inconsistencies if the coming module notifier fails
  livepatch: match return value to function signature
  x86: kaslr: fix build due to missing ALIGN definition
  livepatch: x86: make kASLR logic more accurate
  x86: introduce kaslr_offset()
Diffstat (limited to 'drivers/usb/serial')
0 files changed, 0 insertions, 0 deletions