summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-14 11:10:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-14 11:10:32 -0800
commit6960d58240190a885c09e784b8dcc1345951a7c8 (patch)
tree1a75bf1f7fd4c04712c3a7c7dd8a0285b044ac3e
parentf39fdf2ab846ecc636d6272b47f28a05a2052a14 (diff)
parent59024954a1e7e26b62680e1f2b5725249a6c09f7 (diff)
downloadtalos-obmc-linux-6960d58240190a885c09e784b8dcc1345951a7c8.tar.gz
talos-obmc-linux-6960d58240190a885c09e784b8dcc1345951a7c8.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatch update from Jiri Kosina: "This is just a small documentation update (as the work on the hybrid model is still underway)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching: Documentation/livepatch: Fix stale link to gmame
-rw-r--r--Documentation/livepatch/livepatch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/livepatch/livepatch.txt b/Documentation/livepatch/livepatch.txt
index 6c43f6ebee8d..f5967316deb9 100644
--- a/Documentation/livepatch/livepatch.txt
+++ b/Documentation/livepatch/livepatch.txt
@@ -87,7 +87,7 @@ The theory about how to apply functions a safe way is rather complex.
The aim is to define a so-called consistency model. It attempts to define
conditions when the new implementation could be used so that the system
stays consistent. The theory is not yet finished. See the discussion at
-http://thread.gmane.org/gmane.linux.kernel/1823033/focus=1828189
+https://lkml.kernel.org/r/20141107140458.GA21774@suse.cz
The current consistency model is very simple. It guarantees that either
the old or the new function is called. But various functions get redirected
OpenPOWER on IntegriCloud