diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2018-04-16 14:25:08 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2018-04-16 14:25:08 -0600 |
| commit | 24844fd33945470942c954324ad2c655929000cc (patch) | |
| tree | 391b2999f1900e0ca93349000fd8b334a77615c7 /MAINTAINERS | |
| parent | 32fb7ef69a9f1e3c8ec18a174fbc474b90ee645e (diff) | |
| parent | 82381918c4712ba107d3e4ff7117751f396018f7 (diff) | |
| download | blackbird-op-linux-24844fd33945470942c954324ad2c655929000cc.tar.gz blackbird-op-linux-24844fd33945470942c954324ad2c655929000cc.zip | |
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 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0a1410d5a621..89b8ab9826d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15621,7 +15621,7 @@ L: linux-mm@kvack.org S: Maintained F: mm/zsmalloc.c F: include/linux/zsmalloc.h -F: Documentation/vm/zsmalloc.txt +F: Documentation/vm/zsmalloc.rst ZSWAP COMPRESSED SWAP CACHING M: Seth Jennings <sjenning@redhat.com> |
