Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c01f5120 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'fixes-merge-window-pt2' into fixes

parents a4c8723a f1f028ff

.clang-format

+14 −3
Original line number Diff line number Diff line
@@ -107,10 +107,13 @@ ForEachMacros: 
  - 'css_for_each_descendant_post'

  - 'css_for_each_descendant_pre'

  - 'device_for_each_child_node'

  - 'dma_fence_chain_for_each'

  - 'drm_atomic_crtc_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane'

  - 'drm_atomic_crtc_state_for_each_plane_state'

  - 'drm_atomic_for_each_plane_damage'

  - 'drm_client_for_each_connector_iter'

  - 'drm_client_for_each_modeset'

  - 'drm_connector_for_each_possible_encoder'

  - 'drm_for_each_connector_iter'

  - 'drm_for_each_crtc'
@@ -126,6 +129,7 @@ ForEachMacros: 
  - 'drm_mm_for_each_node_in_range'

  - 'drm_mm_for_each_node_safe'

  - 'flow_action_for_each'

  - 'for_each_active_dev_scope'

  - 'for_each_active_drhd_unit'

  - 'for_each_active_iommu'

  - 'for_each_available_child_of_node'
@@ -153,6 +157,8 @@ ForEachMacros: 
  - 'for_each_cpu_not'

  - 'for_each_cpu_wrap'

  - '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'
@@ -169,6 +175,8 @@ ForEachMacros: 
  - 'for_each_evictable_lru'

  - 'for_each_fib6_node_rt_rcu'

  - 'for_each_fib6_walker_rt'

  - 'for_each_free_mem_pfn_range_in_zone'

  - 'for_each_free_mem_pfn_range_in_zone_from'

  - 'for_each_free_mem_range'

  - 'for_each_free_mem_range_reverse'

  - 'for_each_func_rsrc'
@@ -178,6 +186,7 @@ ForEachMacros: 
  - 'for_each_ip_tunnel_rcu'

  - 'for_each_irq_nr'

  - 'for_each_link_codecs'

  - 'for_each_link_platforms'

  - 'for_each_lru'

  - 'for_each_matching_node'

  - 'for_each_matching_node_and_match'
@@ -302,7 +311,10 @@ ForEachMacros: 
  - 'ide_port_for_each_present_dev'

  - 'idr_for_each_entry'

  - 'idr_for_each_entry_continue'

  - 'idr_for_each_entry_continue_ul'

  - 'idr_for_each_entry_ul'

  - 'in_dev_for_each_ifa_rcu'

  - 'in_dev_for_each_ifa_rtnl'

  - 'inet_bind_bucket_for_each'

  - 'inet_lhash2_for_each_icsk_rcu'

  - 'key_for_each'
@@ -343,8 +355,6 @@ ForEachMacros: 
  - 'media_device_for_each_intf'

  - 'media_device_for_each_link'

  - 'media_device_for_each_pad'

  - 'mp_bvec_for_each_page'

  - 'mp_bvec_for_each_segment'

  - 'nanddev_io_for_each_page'

  - 'netdev_for_each_lower_dev'

  - 'netdev_for_each_lower_private'
@@ -381,18 +391,19 @@ ForEachMacros: 
  - 'radix_tree_for_each_slot'

  - 'radix_tree_for_each_tagged'

  - 'rbtree_postorder_for_each_entry_safe'

  - 'rdma_for_each_block'

  - 'rdma_for_each_port'

  - 'resource_list_for_each_entry'

  - 'resource_list_for_each_entry_safe'

  - 'rhl_for_each_entry_rcu'

  - 'rhl_for_each_rcu'

  - 'rht_for_each'

  - 'rht_for_each_from'

  - 'rht_for_each_entry'

  - 'rht_for_each_entry_from'

  - 'rht_for_each_entry_rcu'

  - 'rht_for_each_entry_rcu_from'

  - 'rht_for_each_entry_safe'

  - 'rht_for_each_from'

  - 'rht_for_each_rcu'

  - 'rht_for_each_rcu_from'

  - '__rq_for_each_bio'

.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

-------