Commit 320424c7 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge tag 'v5.13' into next 

Sync up with the mainline to get the latest parport API.
parents f8f84af5 62fb9874

.clang-format

+11 −2
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ ForEachMacros: 
  - 'css_for_each_child'

  - 'css_for_each_descendant_post'

  - 'css_for_each_descendant_pre'

  - 'cxl_for_each_cmd'

  - 'device_for_each_child_node'

  - 'displayid_iter_for_each'

  - 'dma_fence_chain_for_each'

  - 'do_for_each_ftrace_op'

  - 'drm_atomic_crtc_for_each_plane'
@@ -136,6 +136,7 @@ ForEachMacros: 
  - 'drm_mm_for_each_node_in_range'

  - 'drm_mm_for_each_node_safe'

  - 'flow_action_for_each'

  - 'for_each_acpi_dev_match'

  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'
@@ -171,7 +172,6 @@ ForEachMacros: 
  - 'for_each_dapm_widgets'

  - 'for_each_dev_addr'

  - 'for_each_dev_scope'

  - 'for_each_displayid_db'

  - 'for_each_dma_cap_mask'

  - 'for_each_dpcm_be'

  - 'for_each_dpcm_be_rollback'
@@ -179,6 +179,7 @@ ForEachMacros: 
  - 'for_each_dpcm_fe'

  - 'for_each_drhd_unit'

  - 'for_each_dss_dev'

  - 'for_each_dtpm_table'

  - 'for_each_efi_memory_desc'

  - 'for_each_efi_memory_desc_in_map'

  - 'for_each_element'
@@ -215,6 +216,7 @@ ForEachMacros: 
  - 'for_each_migratetype_order'

  - 'for_each_msi_entry'

  - 'for_each_msi_entry_safe'

  - 'for_each_msi_vector'

  - 'for_each_net'

  - 'for_each_net_continue_reverse'

  - 'for_each_netdev'
@@ -270,6 +272,12 @@ ForEachMacros: 
  - 'for_each_prime_number_from'

  - 'for_each_process'

  - 'for_each_process_thread'

  - 'for_each_prop_codec_conf'

  - 'for_each_prop_dai_codec'

  - 'for_each_prop_dai_cpu'

  - 'for_each_prop_dlc_codecs'

  - 'for_each_prop_dlc_cpus'

  - 'for_each_prop_dlc_platforms'

  - 'for_each_property_of_node'

  - 'for_each_registered_fb'

  - 'for_each_requested_gpio'
@@ -430,6 +438,7 @@ ForEachMacros: 
  - 'queue_for_each_hw_ctx'

  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rb_for_each'

  - 'rbtree_postorder_for_each_entry_safe'

  - 'rdma_for_each_block'

  - 'rdma_for_each_port'

.gitignore

+7 −3
Original line number Diff line number Diff line
@@ -48,22 +48,22 @@ 
*.xz

*.zst

Module.symvers

modules.builtin

modules.order



#

# Top-level generic files

#

/tags

/TAGS

/linux

/modules-only.symvers

/vmlinux

/vmlinux.32

/vmlinux.map

/vmlinux.symvers

/vmlinux-gdb.py

/vmlinuz

/System.map

/Module.markers

/modules.builtin

/modules.builtin.modinfo

/modules.nsdeps
@@ -112,6 +112,10 @@ patches-* 
patches

series



# ctags files

tags

TAGS



# cscope files

cscope.*

ncscope.*

.mailmap

+11 −2
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electr 
Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>

Alexei Starovoitov <ast@kernel.org> <ast@fb.com>

Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>

Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>

Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>

Alex Shi <alexs@kernel.org> <alex.shi@intel.com>

Alex Shi <alexs@kernel.org> <alex.shi@linaro.org>

Alex Shi <alexs@kernel.org> <alex.shi@linux.alibaba.com>

Al Viro <viro@ftp.linux.org.uk>

Al Viro <viro@zenIV.linux.org.uk>

Andi Kleen <ak@linux.intel.com> <ak@suse.de>
@@ -159,6 +160,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com> 
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>

Jens Axboe <axboe@suse.de>

Jens Osterkamp <Jens.Osterkamp@de.ibm.com>

Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>

Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>

Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -210,6 +212,8 @@ 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>

Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>

Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>

Mark Brown <broonie@sirena.org.uk>

Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>

Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
@@ -241,6 +245,9 @@ 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>

Michel Lespinasse <michel@lespinasse.org>

Michel Lespinasse <michel@lespinasse.org> <walken@google.com>

Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>

Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>

Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>

Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
@@ -265,6 +272,8 @@ Nicholas Piggin <npiggin@gmail.com> <piggin@cyberone.com.au> 
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>

Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>

Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>

Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>

Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>

Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

CREDITS

+17 −1
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few 
D: device drivers.  His encouragement also helped many engineers get

D: started working on the Linux kernel.  David passed away in early

D: 2011, and will be greatly missed.

W: https://lkml.org/lkml/2011/4/5/36

W: https://lore.kernel.org/lkml/20110405034819.GA7872@kroah.com



N: Gary Brubaker

E: xavyer@ix.netcom.com
@@ -1874,6 +1874,11 @@ S: Krosenska' 543 
S: 181 00 Praha 8

S: Czech Republic



N: Murali Karicheri

E: m-karicheri2@ti.com

D: Keystone NetCP driver

D: Keystone PCIe host controller driver



N: Jan "Yenya" Kasprzak

E: kas@fi.muni.cz

D: Author of the COSA/SRP sync serial board driver.
@@ -1933,6 +1938,9 @@ N: Kukjin Kim 
E: kgene@kernel.org

D: Samsung S3C, S5P and Exynos ARM architectures



N: Milo Kim

D: TI LP855x, LP8727 and LP8788 drivers



N: Sangbeom Kim

E: sbkim73@samsung.com

D: Samsung SoC Audio (ASoC) drivers
@@ -2536,6 +2544,14 @@ D: Linux/PARISC hacker 
D: AD1889 sound driver

S: Ottawa, Canada



N: Peter Meerwald-Stadler

E: pmeerw@pmeerw.net

W: https://pmeerw.net

D: IIO reviewing, drivers

S: Schießstandstr. 3a

S: A-5061 Elsbethen

S: Austria



N: Dirk Melchers

E: dirk@merlin.nbg.sub.org

D: 8 bit XT hard disk driver for OMTI5520

Documentation/ABI/obsolete/sysfs-class-dax

+1 −1
Original line number Diff line number Diff line 
What:           /sys/class/dax/

Date:           May, 2016

KernelVersion:  v4.7

Contact:        linux-nvdimm@lists.01.org

Contact:        nvdimm@lists.linux.dev

Description:	Device DAX is the device-centric analogue of Filesystem

		DAX (CONFIG_FS_DAX).  It allows memory ranges to be

		allocated and mapped without need of an intervening file