Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Mar 2015 17:46:39 +0000 (10:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Mar 2015 17:46:39 +0000 (10:46 -0700)
commitda11508eb0b00740c7b05290d80d3f38618af4e8
treee970834609500f9fb7ba4ce288b7bc387ab101a0
parente63c733d03070d4d3aaf3a29775b42fa9ab95bbf
parent8cb2c2dc472775479a1a7e78180955f6f1cb0b0a
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/livepatching

Pull livepatching fix from Jiri Kosina:

 - fix for potential race with module loading, from Petr Mladek.

   The race is very unlikely to be seen in real world and has been found
   by code inspection, but should be fixed for 4.0 anyway.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: Fix subtle race with coming and going modules
include/linux/module.h