Merge tag 'v5.10-rc1' into kvmarm-master/next (4f6b838c) · Commits · EulixOS / Software / Kernel

.clang-format

+5 −1

Original line number	Diff line number	Diff line
		@@ -203,11 +203,13 @@ ForEachMacros:
		- 'for_each_matching_node'
		- 'for_each_matching_node_and_match'
		- 'for_each_member'
		- 'for_each_memblock'
		- 'for_each_mem_region'
		- 'for_each_memblock_type'
		- 'for_each_memcg_cache_index'
		- 'for_each_mem_pfn_range'
		- '__for_each_mem_range'
		- 'for_each_mem_range'
		- '__for_each_mem_range_rev'
		- 'for_each_mem_range_rev'
		- 'for_each_migratetype_order'
		- 'for_each_msi_entry'
		@@ -271,6 +273,7 @@ ForEachMacros:
		- 'for_each_registered_fb'
		- 'for_each_requested_gpio'
		- 'for_each_requested_gpio_in_range'
		- 'for_each_reserved_mem_range'
		- 'for_each_reserved_mem_region'
		- 'for_each_rtd_codec_dais'
		- 'for_each_rtd_codec_dais_rollback'
		@@ -426,6 +429,7 @@ ForEachMacros:
		- 'rbtree_postorder_for_each_entry_safe'
		- 'rdma_for_each_block'
		- 'rdma_for_each_port'
		- 'rdma_umem_for_each_dma_block'
		- 'resource_list_for_each_entry'
		- 'resource_list_for_each_entry_safe'
		- 'rhl_for_each_entry_rcu'

.gitignore

+3 −0

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

		# Clang's compilation database file
		/compile_commands.json

		# Documentation toolchain
		sphinx_*/

.mailmap

+10 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,8 @@ Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
		Andrew Vasquez <andrew.vasquez@qlogic.com>
		Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
		Andy Adamson <andros@citi.umich.edu>
		Antoine Tenart <antoine.tenart@free-electrons.com>
		Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
		Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
		Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
		Archit Taneja <archit@ti.com>
		Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
		@@ -132,6 +133,7 @@ James Ketrenos <jketreno@io.(none)>
		Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
		Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		@@ -169,6 +171,10 @@ Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
		Kees Cook <keescook@chromium.org> <keescook@google.com>
		Kees Cook <keescook@chromium.org> <kees@outflux.net>
		Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		@@ -184,6 +190,7 @@ Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
		Linas Vepstas <linas@austin.ibm.com>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
		Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
		Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
		Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
		Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
		@@ -191,6 +198,7 @@ Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
		Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
		Mark Brown <broonie@sirena.org.uk>
		Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
		Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
		Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
		@@ -308,6 +316,7 @@ Tony Luck <tony.luck@intel.com>
		TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
		TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,10 @@ N: Krishna Balasubramanian
		E: balasub@cis.ohio-state.edu
		D: Wrote SYS V IPC (part of standard kernel since 0.99.10)

		B: Robert Baldyga
		E: r.baldyga@hackerion.com
		D: Samsung S3FWRN5 NCI NFC Controller

		N: Chris Ball
		E: chris@printf.net
		D: Former maintainer of the MMC/SD/SDIO subsystem.
		@@ -1942,6 +1946,10 @@ S: Post Office Box 611311
		S: San Jose, California 95161-1311
		S: USA

		N: Hartmut Knaack
		E: knaack.h@gmx.de
		D: IIO subsystem and drivers

		N: Thorsten Knabe
		E: Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>
		E: Thorsten Knabe <tek01@hrzpub.tu-darmstadt.de>

Documentation/ABI/obsolete/sysfs-selinux-checkreqprot

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ Description:
		actual protection), and Android and Linux distributions have been
		explicitly writing a "0" to /sys/fs/selinux/checkreqprot during
		initialization for some time. Support for setting checkreqprot to 1
		will be removed in a future kernel release, at which point the kernel
		will be removed no sooner than June 2021, at which point the kernel
		will always cease using checkreqprot internally and will always
		check the actual protections being applied upon mmap/mprotect calls.
		The checkreqprot selinuxfs node will remain for backward compatibility