Commit 8c79f4cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 2646719a d9defe44

.mailmap

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 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>
@@ -126,6 +128,8 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com> 
Linas Vepstas <linas@austin.ibm.com>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>

Mark Brown <broonie@sirena.org.uk>
@@ -217,6 +221,8 @@ Tejun Heo <htejun@gmail.com> 
Thomas Graf <tgraf@suug.ch>

Thomas Pedersen <twp@codeaurora.org>

Tony Luck <tony.luck@intel.com>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

Uwe Kleine-König <ukl@pengutronix.de>

Documentation/ABI/testing/sysfs-kernel-livepatch

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ Description: 
		use this feature without a clearance from a patch

		distributor. Removal (rmmod) of patch modules is permanently

		disabled when the feature is used. See

		Documentation/livepatch/livepatch.txt for more information.

		Documentation/livepatch/livepatch.rst for more information.



What:		/sys/kernel/livepatch/<patch>/<object>

Date:		Nov 2014

Documentation/DMA-API-HOWTO.txt

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ networking subsystems make sure that the buffers they use are valid 
for you to DMA from/to.



DMA addressing capabilities

==========================

===========================



By default, the kernel assumes that your device can address 32-bits of DMA

addressing.  For a 64-bit capable device, this needs to be increased, and for

Documentation/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -28,8 +28,13 @@ ifeq ($(HAVE_SPHINX),0) 


else # HAVE_SPHINX



# User-friendly check for pdflatex

# User-friendly check for pdflatex and latexmk

HAVE_PDFLATEX := $(shell if which $(PDFLATEX) >/dev/null 2>&1; then echo 1; else echo 0; fi)

HAVE_LATEXMK := $(shell if which latexmk >/dev/null 2>&1; then echo 1; else echo 0; fi)



ifeq ($(HAVE_LATEXMK),1)

	PDFLATEX := latexmk -$(PDFLATEX)

endif #HAVE_LATEXMK



# Internal variables.

PAPEROPT_a4     = -D latex_paper_size=a4
@@ -82,7 +87,7 @@ pdfdocs: 
else # HAVE_PDFLATEX



pdfdocs: latexdocs

	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX=$(PDFLATEX) LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex || exit;)

	$(foreach var,$(SPHINXDIRS), $(MAKE) PDFLATEX="$(PDFLATEX)" LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex || exit;)



endif # HAVE_PDFLATEX

Documentation/atomic_bitops.txt

+3 −3
Original line number Diff line number Diff line 


On atomic bitops.



=============

Atomic bitops

=============



While our bitmap_{}() functions are non-atomic, we have a number of operations

operating on single bits in a bitmap that are atomic.

CRA Git | Maintained and supported by SUSTech CRA and CCSE