From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 May 2019 19:42:50 +0000 (-0700)
Subject: Merge tag 'docs-5.2' of git://git.lwn.net/linux
X-Git-Tag: v5.4-rc1~1046
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf;p=platform%2Fkernel%2Flinux-rpi.git

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
  ...
---

8c79f4cd441b27df6cadd11b70a50e06b3b3a2bf
diff --cc .mailmap
index 0049c0b,7dc884c..07a777f
--- a/.mailmap
+++ b/.mailmap
@@@ -16,9 -16,8 +16,11 @@@ Alan Cox <alan@lxorguk.ukuu.org.uk
  Alan Cox <root@hraefn.swansea.linux.org.uk>
  Aleksey Gorelov <aleksey_gorelov@phoenix.com>
  Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
+ Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
+ Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
 +Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
 +Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
 +Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
  Al Viro <viro@ftp.linux.org.uk>
  Al Viro <viro@zenIV.linux.org.uk>
  Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
diff --cc Documentation/clearing-warn-once.txt
index c68598b,4aa9382..211fd92
--- a/Documentation/clearing-warn-once.txt
+++ b/Documentation/clearing-warn-once.txt
@@@ -1,5 -1,7 +1,7 @@@
+ Clearing WARN_ONCE
+ ------------------
  
 -WARN_ONCE / WARN_ON_ONCE only print a warning once.
 +WARN_ONCE / WARN_ON_ONCE / printk_once only emit a message once.
  
  echo 1 > /sys/kernel/debug/clear_warn_once