]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 319645c e41b104)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2015 20:16:12 +0000 (12:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2015 20:16:12 +0000 (12:16 -0800)
commita3d66b5a17f81ee84604f95b0e2c9ccf0434c6f0
tree542e78181dcd7ac022fb581942e284fce2c895cdtree
parent319645cac26c2d065a485f5d59228433ad602f71commit | diff
parente41b104c7dba92443e594e6bc86e4b0bf1cdf573commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

Pull livepatching fix from Jiri Kosina:
 "A fix for module handling in case kASLR has been enabled, from Zhou
  Chengming"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: x86: fix relocation computation with kASLR
Ubuntu combined Linux kernel mirror