From: Linus Torvalds Date: Wed, 18 Mar 2015 17:46:39 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... X-Git-Tag: v4.0-rc5~29 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=da11508eb0b00740c7b05290d80d3f38618af4e8;p=linux-2.6-block.git 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 --- da11508eb0b00740c7b05290d80d3f38618af4e8