Unverified Commit 031616c4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/for-5.10' into asoc-linus

parents 064841cc 85a75555

.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

+2 −0
Original line number Diff line number Diff line
@@ -133,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>
@@ -197,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>

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