author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 14 Aug 2018 21:29:31 +0000 (14:29 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 14 Aug 2018 21:29:31 +0000 (14:29 -0700) |
Pull documentation update from Jonathan Corbet:
"This was a moderately busy cycle for docs, with the usual collection
of small fixes and updates.
We also have new ktime_get_*() docs from Arnd, some kernel-doc fixes,
a new set of Italian translations (non so se vale la pena, ma non fa
male - speriamo bene), and some extensive early memory-management
documentation improvements from Mike Rapoport"
* tag 'docs-4.19' of git://git.lwn.net/linux: (52 commits)
Documentation: corrections to console/console.txt
Documentation: add ioctl number entry for v4l2-subdev.h
Remove gendered language from management style documentation
scripts/kernel-doc: Escape all literal braces in regexes
docs/mm: add description of boot time memory management
docs/mm: memblock: add overview documentation
docs/mm: memblock: add kernel-doc description for memblock types
docs/mm: memblock: add kernel-doc comments for memblock_add[_node]
docs/mm: memblock: update kernel-doc comments
mm/memblock: add a name for memblock flags enumeration
docs/mm: bootmem: add overview documentation
docs/mm: bootmem: add kernel-doc description of 'struct bootmem_data'
docs/mm: bootmem: fix kernel-doc warnings
docs/mm: nobootmem: fixup kernel-doc comments
mm/bootmem: drop duplicated kernel-doc comments
Documentation: vm.txt: Adding 'nr_hugepages_mempolicy' parameter description.
doc:it_IT: translation for kernel-hacking
docs: Fix the reference labels in Locking.rst
doc: tracing: Fix a typo of trace_stat
mm: Introduce new type vm_fault_t
...
"This was a moderately busy cycle for docs, with the usual collection
of small fixes and updates.
We also have new ktime_get_*() docs from Arnd, some kernel-doc fixes,
a new set of Italian translations (non so se vale la pena, ma non fa
male - speriamo bene), and some extensive early memory-management
documentation improvements from Mike Rapoport"
* tag 'docs-4.19' of git://git.lwn.net/linux: (52 commits)
Documentation: corrections to console/console.txt
Documentation: add ioctl number entry for v4l2-subdev.h
Remove gendered language from management style documentation
scripts/kernel-doc: Escape all literal braces in regexes
docs/mm: add description of boot time memory management
docs/mm: memblock: add overview documentation
docs/mm: memblock: add kernel-doc description for memblock types
docs/mm: memblock: add kernel-doc comments for memblock_add[_node]
docs/mm: memblock: update kernel-doc comments
mm/memblock: add a name for memblock flags enumeration
docs/mm: bootmem: add overview documentation
docs/mm: bootmem: add kernel-doc description of 'struct bootmem_data'
docs/mm: bootmem: fix kernel-doc warnings
docs/mm: nobootmem: fixup kernel-doc comments
mm/bootmem: drop duplicated kernel-doc comments
Documentation: vm.txt: Adding 'nr_hugepages_mempolicy' parameter description.
doc:it_IT: translation for kernel-hacking
docs: Fix the reference labels in Locking.rst
doc: tracing: Fix a typo of trace_stat
mm: Introduce new type vm_fault_t
...
1 | 2 | |||
---|---|---|---|---|
Documentation/admin-guide/kernel-parameters.txt | patch | | diff1 | | diff2 | | blob | history |
Documentation/filesystems/Locking | patch | | diff1 | | diff2 | | blob | history |
Documentation/index.rst | patch | | diff1 | | diff2 | | blob | history |
MAINTAINERS | patch | | diff1 | | diff2 | | blob | history |
include/linux/timekeeping.h | patch | | diff1 | | diff2 | | blob | history |
mm/memblock.c | patch | | diff1 | | diff2 | | blob | history |
Simple merge
diff --cc Documentation/filesystems/Locking
Simple merge
diff --cc Documentation/index.rst
index f95ba981f8cd17d61523ad0f82e83cddcce72212,5d310d960f82557986eed39690e4d6922e032ce0..d43fcd25c1da2d6cd6daa3439e2aaf65eb69cde6
+++ b/Documentation/index.rst
sh/index
- Korean translations
- -------------------
-
- .. toctree::
- :maxdepth: 1
-
- translations/ko_KR/index
-
- Chinese translations
- --------------------
+Filesystem Documentation
+------------------------
+
+The documentation in this section are provided by specific filesystem
+subprojects.
+
+.. toctree::
+ :maxdepth: 2
+
+ filesystems/ext4/index
+
+ Translations
+ ------------
.. toctree::
- :maxdepth: 1
-
- translations/zh_CN/index
-
- Japanese translations
- ---------------------
-
- .. toctree::
- :maxdepth: 1
+ :maxdepth: 2
- translations/ja_JP/index
+ translations/index
Indices and tables
==================
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/timekeeping.h
Simple merge
diff --cc mm/memblock.c
Simple merge