Commit cbecf716 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus 

Prepare input updates for 5.12 merge window.
parents 6524d8ea 4c47097f

.clang-format

+11 −4
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ ForEachMacros: 
  - 'drm_for_each_bridge_in_chain'

  - 'drm_for_each_connector_iter'

  - 'drm_for_each_crtc'

  - 'drm_for_each_crtc_reverse'

  - 'drm_for_each_encoder'

  - 'drm_for_each_encoder_mask'

  - 'drm_for_each_fb'
@@ -203,12 +204,13 @@ ForEachMacros: 
  - 'for_each_matching_node'

  - 'for_each_matching_node_and_match'

  - 'for_each_member'

  - 'for_each_memblock'

  - '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_mem_region'

  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'
@@ -271,12 +273,11 @@ 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'

  - 'for_each_rtd_components'

  - 'for_each_rtd_cpu_dais'

  - 'for_each_rtd_cpu_dais_rollback'

  - 'for_each_rtd_dais'

  - 'for_each_set_bit'

  - 'for_each_set_bit_from'
@@ -295,6 +296,7 @@ ForEachMacros: 
  - '__for_each_thread'

  - 'for_each_thread'

  - 'for_each_unicast_dest_pgid'

  - 'for_each_vsi'

  - 'for_each_wakeup_source'

  - 'for_each_zone'

  - 'for_each_zone_zonelist'
@@ -327,6 +329,7 @@ ForEachMacros: 
  - 'hlist_for_each_entry_rcu_bh'

  - 'hlist_for_each_entry_rcu_notrace'

  - 'hlist_for_each_entry_safe'

  - 'hlist_for_each_entry_srcu'

  - '__hlist_for_each_rcu'

  - 'hlist_for_each_safe'

  - 'hlist_nulls_for_each_entry'
@@ -375,6 +378,7 @@ ForEachMacros: 
  - 'list_for_each_entry_safe_continue'

  - 'list_for_each_entry_safe_from'

  - 'list_for_each_entry_safe_reverse'

  - 'list_for_each_entry_srcu'

  - 'list_for_each_prev'

  - 'list_for_each_prev_safe'

  - 'list_for_each_safe'
@@ -408,6 +412,8 @@ ForEachMacros: 
  - 'of_property_for_each_string'

  - 'of_property_for_each_u32'

  - 'pci_bus_for_each_resource'

  - 'pcl_for_each_chunk'

  - 'pcl_for_each_segment'

  - 'pcm_for_each_format'

  - 'ping_portaddr_for_each_entry'

  - 'plist_for_each'
@@ -426,6 +432,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

+22 −4
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ 
#

# Please keep this list dictionary sorted.

#

# This comment is parsed by git-shortlog:

# repo-abbrev: /pub/scm/linux/kernel/git/

#

Aaron Durbin <adurbin@google.com>

Adam Oldham <oldhamca@gmail.com>

Adam Radford <aradford@gmail.com>
@@ -40,6 +37,7 @@ Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk> 
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>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>

Andy Adamson <andros@citi.umich.edu>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>

Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
@@ -55,6 +53,8 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>

Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
@@ -119,6 +122,8 @@ Henk Vergonet <Henk.Vergonet@gmail.com> 
Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>

Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>

Jacob Shin <Jacob.Shin@amd.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
@@ -133,6 +138,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>
@@ -174,6 +180,8 @@ 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>

Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.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>
@@ -194,9 +202,12 @@ 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>

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

Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>

Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>

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>
@@ -238,6 +249,7 @@ Morten Welinder <welinder@anemone.rentec.com> 
Morten Welinder <welinder@darter.rentec.com>

Morten Welinder <welinder@troll.com>

Mythri P K <mythripk@ti.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Nguyen Anh Quynh <aquynh@gmail.com>

Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>

Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
@@ -285,6 +297,7 @@ Santosh Shilimkar <ssantosh@kernel.org> 
Sarangdhar Joshi <spjoshi@codeaurora.org>

Sascha Hauer <s.hauer@pengutronix.de>

S.Çağlar Onur <caglar@pardus.org.tr>

Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>

Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>

Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>

Sebastian Reichel <sre@kernel.org> <sre@debian.org>
@@ -316,6 +329,8 @@ 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 <u.kleine-koenig@pengutronix.de>

Uwe Kleine-König <ukleinek@strlen.de>

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

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
@@ -325,6 +340,8 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org> 
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>

Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.org>

Viresh Kumar <viresh.kumar@linaro.org> <viresh.kumar@linaro.com>

Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>

Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
@@ -335,3 +352,4 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de> 
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>

Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>

Yusuke Goda <goda.yusuke@renesas.com>

Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

CREDITS

+82 −35
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.
@@ -706,6 +710,10 @@ S: Las Cuevas 2385 - Bo Guemes 
S: Las Heras, Mendoza CP 5539

S: Argentina



N: Jay Cliburn

E: jcliburn@gmail.com

D: ATLX Ethernet drivers



N: Steven P. Cole

E: scole@lanl.gov

E: elenstev@mesatop.com
@@ -736,6 +744,11 @@ S: (ask for current address) 
S: Portland, Oregon

S: USA



N: Jason Cooper

D: ARM/Marvell SOC co-maintainer

D: irqchip co-maintainer

D: MVEBU PCI DRIVER co-maintainer



N: Robin Cornelius

E: robincornelius@users.sourceforge.net

D: Ralink rt2x00 WLAN driver
@@ -845,6 +858,12 @@ D: trivial hack to add variable address length routing to Rose. 
D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO

D: ax25-utils maintainer.



N: Kamil Debski

E: kamil@wypas.org

D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers

D: Samsung USB2 phy drivers

D: PWM fan driver



N: Helge Deller

E: deller@gmx.de

W: http://www.parisc-linux.org/
@@ -1269,6 +1288,10 @@ D: Major kbuild rework during the 2.5 cycle 
D: ISDN Maintainer

S: USA



N: Gerrit Renker

E: gerrit@erg.abdn.ac.uk

D: DCCP protocol support.



N: Philip Gladstone

E: philip@gladstonefamily.net

D: Kernel / timekeeping stuff
@@ -1906,6 +1929,15 @@ S: 660 Harvard Ave. #7 
S: Santa Clara, CA 95051

S: USA



N: Kukjin Kim

E: kgene@kernel.org

D: Samsung S3C, S5P and Exynos ARM architectures



N: Sangbeom Kim

E: sbkim73@samsung.com

D: Samsung SoC Audio (ASoC) drivers

D: Samsung PMIC (RTC, regulators, MFD) drivers



N: Russell King

E: rmk@arm.linux.org.uk

D: Linux/arm integrator, maintainer & hacker
@@ -1942,6 +1974,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>
@@ -2110,6 +2146,10 @@ E: seasons@falcon.sch.bme.hu 
E: seasons@makosteszta.sote.hu

D: Original author of software suspend



N: Alexey Kuznetsov

E: kuznet@ms2.inr.ac.ru

D: Author and maintainer of large parts of the networking stack



N: Jaroslav Kysela

E: perex@perex.cz

W: https://www.perex.cz
@@ -2482,15 +2522,6 @@ W: http://www.rdrop.com/users/paulmck/ 
D: RCU and variants

D: rcutorture module



N: Mike McLagan

E: mike.mclagan@linux.org

W: http://www.invlogic.com/~mmclagan

D: DLCI/FRAD drivers for Sangoma SDLAs

S: Innovative Logic Corp

S: Post Office Box 1068

S: Laurel, Maryland 20732

S: USA



N: Bradley McLean

E: brad@bradpc.gaylord.com

D: Device driver hacker
@@ -2677,6 +2708,10 @@ N: Wolfgang Muees 
E: wolfgang@iksw-muees.de

D: Auerswald USB driver



N: Shrijeet Mukherjee

E: shrijeet@gmail.com

D: Network routing domains (VRF).



N: Paul Mundt

E: paul.mundt@gmail.com

D: SuperH maintainer
@@ -2835,6 +2870,10 @@ D: IPX development and support 
N: Venkatesh Pallipadi (Venki)

D: x86/HPET



N: Kyungmin Park

E: kyungmin.park@samsung.com

D: Samsung S5Pv210 and Exynos4210 mobile platforms



N: David Parsons

E: orc@pell.chi.il.us

D: improved memory detection code.
@@ -4087,6 +4126,10 @@ S: B-1206 Jingmao Guojigongyu 
S: 16 Baliqiao Nanjie, Beijing 101100

S: People's Repulic of China



N: Aviad Yehezkel

E: aviadye@nvidia.com

D: Kernel TLS implementation and offload support.



N: Victor Yodaiken

E: yodaiken@fsmlabs.com

D: RTLinux (RealTime Linux)
@@ -4144,6 +4187,10 @@ S: 1507 145th Place SE #B5 
S: Bellevue, Washington 98007

S: USA



N: Wensong Zhang

E: wensong@linux-vs.org

D: IP virtual server (IPVS).



N: Haojian Zhuang

E: haojian.zhuang@gmail.com

D: MMP support

Documentation/ABI/README

+9 −1
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ Users: All users of this interface who wish to be notified when 
		be changed further.





Note:

   The fields should be use a simple notation, compatible with ReST markup.

   Also, the file **should not** have a top-level index, like::



	===

	foo

	===



How things move between levels:



Interfaces in stable may move to obsolete, as long as the proper