Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes (ae1ad263) · Commits · e / devices / android_kernel_fairphone_FP5

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -142,3 +142,6 @@ x509.genkey

		# Kdevelop4
		*.kdev4

		# Clang's compilation database file
		/compile_commands.json

.mailmap

+8 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,9 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>
		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
		Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
		Domen Puncer <domen@coderock.org>
		Douglas Gilbert <dougg@torque.net>
		Ed L. Cashin <ecashin@coraid.com>
		@@ -98,6 +101,7 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jean Tourrilhes <jt@hpl.hp.com>
		<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>
		Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
		Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
		@@ -116,6 +120,7 @@ John Stultz <johnstul@us.ibm.com>
		Juha Yrjola <at solidboot.com>
		Juha Yrjola <juha.yrjola@nokia.com>
		Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		@@ -132,6 +137,7 @@ 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>
		Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Mark Brown <broonie@sirena.org.uk>
		Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
		@@ -157,6 +163,8 @@ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.co
		Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
		Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
		Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
		Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>

Documentation/PCI/index.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ Linux PCI Bus Subsystem
		:numbered:

		pci
		picebus-howto
		pciebus-howto
		pci-iov-howto
		msi-howto
		acpi-info

Documentation/PCI/pci-error-recovery.rst

+4 −1

Original line number	Diff line number	Diff line
		@@ -403,7 +403,7 @@ That is, the recovery API only requires that:
		.. note::

		Implementation details for the powerpc platform are discussed in
		the file Documentation/powerpc/eeh-pci-error-recovery.txt
		the file Documentation/powerpc/eeh-pci-error-recovery.rst

		As of this writing, there is a growing list of device drivers with
		patches implementing error recovery. Not all of these patches are in
		@@ -422,3 +422,6 @@ That is, the recovery API only requires that:
		- drivers/net/cxgb3
		- drivers/net/s2io.c
		- drivers/net/qlge

		The End
		-------

Documentation/PCI/picebus-howto.rst→Documentation/PCI/pciebus-howto.rst

+0 −0

File moved.

View file