Merge tag 'docs-5.2' of git://git.lwn.net/linux (8c79f4cd) · Commits · jan.koester / Linux

.mailmap

+6 −0

Documentation/ABI/testing/sysfs-kernel-livepatch

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ Description:
	use this feature without a clearance from a patch		use this feature without a clearance from a patch
	distributor. Removal (rmmod) of patch modules is permanently		distributor. Removal (rmmod) of patch modules is permanently
	disabled when the feature is used. See		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>		What: /sys/kernel/livepatch/<patch>/<object>
	Date: Nov 2014		Date: Nov 2014

Documentation/DMA-API-HOWTO.txt

+1 −1

Original line number	Original line	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.		for you to DMA from/to.

	DMA addressing capabilities		DMA addressing capabilities
	==========================		===========================

	By default, the kernel assumes that your device can address 32-bits of DMA		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		addressing. For a 64-bit capable device, this needs to be increased, and for

Documentation/Makefile

+7 −2

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

	else # HAVE_SPHINX		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_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.		# Internal variables.
	PAPEROPT_a4 = -D latex_paper_size=a4		PAPEROPT_a4 = -D latex_paper_size=a4
	@@ -82,7 +87,7 @@ pdfdocs:
	else # HAVE_PDFLATEX		else # HAVE_PDFLATEX

	pdfdocs: latexdocs		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		endif # HAVE_PDFLATEX

Documentation/atomic_bitops.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
			=============
	On atomic bitops.		Atomic bitops
			=============

	While our bitmap_{}() functions are non-atomic, we have a number of operations		While our bitmap_{}() functions are non-atomic, we have a number of operations
	operating on single bits in a bitmap that are atomic.		operating on single bits in a bitmap that are atomic.

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,8 @@ Alan Cox <alan@lxorguk.ukuu.org.uk>
	Alan Cox <root@hraefn.swansea.linux.org.uk>		Alan Cox <root@hraefn.swansea.linux.org.uk>
	Aleksey Gorelov <aleksey_gorelov@phoenix.com>		Aleksey Gorelov <aleksey_gorelov@phoenix.com>
	Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.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> <ast@plumgrid.com>
	Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>		Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
	Alexei Starovoitov <ast@kernel.org> <ast@fb.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>		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@web.de>
	Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>		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>		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
	Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
	Mark Brown <broonie@sirena.org.uk>		Mark Brown <broonie@sirena.org.uk>
	@@ -217,6 +221,8 @@ Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
	Thomas Pedersen <twp@codeaurora.org>		Thomas Pedersen <twp@codeaurora.org>
	Tony Luck <tony.luck@intel.com>		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>		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>