summaryrefslogtreecommitdiff
path: root/Documentation/vm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-11 00:12:15 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-11 00:12:15 +0300
commit6d62c5b21155acaaaeb24862d62cf15d1dc2d8ba (patch)
tree2110c1fe440ef5290726d951b9ad38a0e24a8404 /Documentation/vm
parent6672966d6c854d5b05a10227fd21e4e0895719f7 (diff)
parent146f5cdeda153a1c7866cd240d2f464543d368c0 (diff)
downloadlinux-6d62c5b21155acaaaeb24862d62cf15d1dc2d8ba.tar.xz
Merge tag 'docs-5.8-2' of git://git.lwn.net/linux
Pull more documentation updates from Jonathan Corbet: "A handful of late-arriving docs fixes, along with a patch changing a lot of HTTP links to HTTPS that had to be yanked and redone before the first pull" * tag 'docs-5.8-2' of git://git.lwn.net/linux: docs/memory-barriers.txt/kokr: smp_mb__{before,after}_atomic(): update Documentation Documentation: devres: add missing entry for devm_platform_get_and_ioremap_resource() Replace HTTP links with HTTPS ones: documentation docs: it_IT: address invalid reference warnings doc: zh_CN: use doc reference to resolve undefined label warning docs: Update the location of the LF NDA program docs: dev-tools: coccinelle: underlines
Diffstat (limited to 'Documentation/vm')
-rw-r--r--Documentation/vm/ksm.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vm/ksm.rst b/Documentation/vm/ksm.rst
index d32016d9be2c..d1b7270ad55c 100644
--- a/Documentation/vm/ksm.rst
+++ b/Documentation/vm/ksm.rst
@@ -6,7 +6,7 @@ Kernel Samepage Merging
KSM is a memory-saving de-duplication feature, enabled by CONFIG_KSM=y,
added to the Linux kernel in 2.6.32. See ``mm/ksm.c`` for its implementation,
-and http://lwn.net/Articles/306704/ and http://lwn.net/Articles/330589/
+and http://lwn.net/Articles/306704/ and https://lwn.net/Articles/330589/
The userspace interface of KSM is described in :ref:`Documentation/admin-guide/mm/ksm.rst <admin_guide_ksm>`