diff options
author | Jonathan Corbet <corbet@lwn.net> | 2018-04-16 23:25:08 +0300 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2018-04-16 23:25:08 +0300 |
commit | 24844fd33945470942c954324ad2c655929000cc (patch) | |
tree | 391b2999f1900e0ca93349000fd8b334a77615c7 /include/linux/memremap.h | |
parent | 32fb7ef69a9f1e3c8ec18a174fbc474b90ee645e (diff) | |
parent | 82381918c4712ba107d3e4ff7117751f396018f7 (diff) | |
download | linux-24844fd33945470942c954324ad2c655929000cc.tar.xz |
Merge branch 'mm-rst' into docs-next
Mike Rapoport says:
These patches convert files in Documentation/vm to ReST format, add an
initial index and link it to the top level documentation.
There are no contents changes in the documentation, except few spelling
fixes. The relatively large diffstat stems from the indentation and
paragraph wrapping changes.
I've tried to keep the formatting as consistent as possible, but I could
miss some places that needed markup and add some markup where it was not
necessary.
[jc: significant conflicts in vm/hmm.rst]
Diffstat (limited to 'include/linux/memremap.h')
-rw-r--r-- | include/linux/memremap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/memremap.h b/include/linux/memremap.h index 7b4899c06f49..74ea5e2310a8 100644 --- a/include/linux/memremap.h +++ b/include/linux/memremap.h @@ -45,7 +45,7 @@ struct vmem_altmap { * must be treated as an opaque object, rather than a "normal" struct page. * * A more complete discussion of unaddressable memory may be found in - * include/linux/hmm.h and Documentation/vm/hmm.txt. + * include/linux/hmm.h and Documentation/vm/hmm.rst. * * MEMORY_DEVICE_PUBLIC: * Device memory that is cache coherent from device and CPU point of view. This @@ -67,7 +67,7 @@ enum memory_type { * page_free() * * Additional notes about MEMORY_DEVICE_PRIVATE may be found in - * include/linux/hmm.h and Documentation/vm/hmm.txt. There is also a brief + * include/linux/hmm.h and Documentation/vm/hmm.rst. There is also a brief * explanation in include/linux/memory_hotplug.h. * * The page_fault() callback must migrate page back, from device memory to |