diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 15:42:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-08 15:42:50 -0400 |
commit | 8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf (patch) | |
tree | 0d7fca2a5fb43fa75b51c4cdaaee493e44d56d62 /Documentation/dontdiff | |
parent | 2646719a48c21ba0cae82a3f57382a9573fd8400 (diff) | |
parent | d9defe448f4c7b88ca2ae636a321ef8970fa718d (diff) |
Merge tag 'docs-5.2' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet:
"A reasonably busy cycle for docs, including:
- Lots of work on the Chinese and Italian translations
- Some license-rules clarifications from Christoph
- Various build-script fixes
- A new document on memory models
- RST conversion of the live-patching docs
- The usual collection of typo fixes and corrections"
* tag 'docs-5.2' of git://git.lwn.net/linux: (140 commits)
docs/livepatch: Unify style of livepatch documentation in the ReST format
docs: livepatch: convert docs to ReST and rename to *.rst
scripts/documentation-file-ref-check: detect broken :doc:`foo`
scripts/documentation-file-ref-check: don't parse Next/ dir
LICENSES: Rename other to deprecated
LICENSES: Clearly mark dual license only licenses
docs: Don't reference the ZLib license in license-rules.rst
docs/vm: Minor editorial changes in the THP and hugetlbfs
docs/vm: add documentation of memory models
doc:it_IT: translation alignment
doc: fix typo in PGP guide
dontdiff: update with Kconfig build artifacts
docs/zh_CN: fix typos in 1.Intro.rst file
docs/zh_CN: redirect CoC docs to Chinese version
doc: mm: migration doesn't use FOLL_SPLIT anymore
docs: doc-guide: remove the extension from .rst files
doc: kselftest: Fix KBUILD_OUTPUT usage instructions
docs: trace: fix some Sphinx warnings
docs: speculation.txt: mark example blocks as such
docs: ntb.txt: add blank lines to clean up some Sphinx warnings
...
Diffstat (limited to 'Documentation/dontdiff')
-rw-r--r-- | Documentation/dontdiff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 48e1930fb4a4..5eba889ea84d 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
@@ -127,7 +127,7 @@ flask.h | |||
127 | fore200e_mkfirm | 127 | fore200e_mkfirm |
128 | fore200e_pca_fw.c* | 128 | fore200e_pca_fw.c* |
129 | gconf | 129 | gconf |
130 | gconf.glade.h | 130 | gconf-cfg |
131 | gen-devlist | 131 | gen-devlist |
132 | gen_crc32table | 132 | gen_crc32table |
133 | gen_init_cpio | 133 | gen_init_cpio |
@@ -148,24 +148,22 @@ int32.c | |||
148 | int4.c | 148 | int4.c |
149 | int8.c | 149 | int8.c |
150 | kallsyms | 150 | kallsyms |
151 | kconfig | ||
152 | keywords.c | 151 | keywords.c |
153 | ksym.c* | 152 | ksym.c* |
154 | ksym.h* | 153 | ksym.h* |
155 | kxgettext | ||
156 | *lex.c | 154 | *lex.c |
157 | *lex.*.c | 155 | *lex.*.c |
158 | linux | 156 | linux |
159 | logo_*.c | 157 | logo_*.c |
160 | logo_*_clut224.c | 158 | logo_*_clut224.c |
161 | logo_*_mono.c | 159 | logo_*_mono.c |
162 | lxdialog | ||
163 | mach-types | 160 | mach-types |
164 | mach-types.h | 161 | mach-types.h |
165 | machtypes.h | 162 | machtypes.h |
166 | map | 163 | map |
167 | map_hugetlb | 164 | map_hugetlb |
168 | mconf | 165 | mconf |
166 | mconf-cfg | ||
169 | miboot* | 167 | miboot* |
170 | mk_elfconfig | 168 | mk_elfconfig |
171 | mkboot | 169 | mkboot |
@@ -183,6 +181,7 @@ modules.builtin.modinfo | |||
183 | modules.order | 181 | modules.order |
184 | modversions.h* | 182 | modversions.h* |
185 | nconf | 183 | nconf |
184 | nconf-cfg | ||
186 | ncscope.* | 185 | ncscope.* |
187 | offset.h | 186 | offset.h |
188 | oui.c* | 187 | oui.c* |
@@ -202,6 +201,7 @@ pnmtologo | |||
202 | ppc_defs.h* | 201 | ppc_defs.h* |
203 | pss_boot.h | 202 | pss_boot.h |
204 | qconf | 203 | qconf |
204 | qconf-cfg | ||
205 | r100_reg_safe.h | 205 | r100_reg_safe.h |
206 | r200_reg_safe.h | 206 | r200_reg_safe.h |
207 | r300_reg_safe.h | 207 | r300_reg_safe.h |