vc_sm: Let it support to build in the non-src folder

If we build the kernel with "-O=$non-src-folder", this driver will introdcue a building error because of the header's location. Signed-off-by: Hui Wang <hui.wang@canonical.com>
rtl8192cu: Let it support to build in the non-src folder
2025-12-28 04:52:52 +00:00 · 2019-09-17 11:20:15 +01:00 · 2019-09-17 11:20:15 +01:00 · 2019-09-17 11:20:15 +01:00 · 2019-09-17 11:20:15 +01:00 · 2019-09-17 11:20:15 +01:00
44434 changed files with 2070093 additions and 4516999 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -80,15 +80,12 @@ ForEachMacros:
  - 'ax25_uid_for_each'
  - '__bio_for_each_bvec'
  - 'bio_for_each_bvec'
-  - 'bio_for_each_bvec_all'
  - 'bio_for_each_integrity_vec'
  - '__bio_for_each_segment'
  - 'bio_for_each_segment'
  - 'bio_for_each_segment_all'
  - 'bio_list_for_each'
  - 'bip_for_each_vec'
-  - 'bitmap_for_each_clear_region'
-  - 'bitmap_for_each_set_region'
  - 'blkg_for_each_descendant_post'
  - 'blkg_for_each_descendant_pre'
  - 'blk_queue_for_each_rl'
@@ -111,7 +108,6 @@ ForEachMacros:
  - 'css_for_each_descendant_pre'
  - 'device_for_each_child_node'
  - 'dma_fence_chain_for_each'
-  - 'do_for_each_ftrace_op'
  - 'drm_atomic_crtc_for_each_plane'
  - 'drm_atomic_crtc_state_for_each_plane'
  - 'drm_atomic_crtc_state_for_each_plane_state'
@@ -119,7 +115,6 @@ ForEachMacros:
  - 'drm_client_for_each_connector_iter'
  - 'drm_client_for_each_modeset'
  - 'drm_connector_for_each_possible_encoder'
-  - 'drm_for_each_bridge_in_chain'
  - 'drm_for_each_connector_iter'
  - 'drm_for_each_crtc'
  - 'drm_for_each_encoder'
@@ -137,21 +132,16 @@ ForEachMacros:
  - 'for_each_active_dev_scope'
  - 'for_each_active_drhd_unit'
  - 'for_each_active_iommu'
-  - 'for_each_aggr_pgid'
  - 'for_each_available_child_of_node'
  - 'for_each_bio'
  - 'for_each_board_func_rsrc'
  - 'for_each_bvec'
-  - 'for_each_card_auxs'
-  - 'for_each_card_auxs_safe'
  - 'for_each_card_components'
-  - 'for_each_card_dapms'
-  - 'for_each_card_pre_auxs'
+  - 'for_each_card_links'
+  - 'for_each_card_links_safe'
  - 'for_each_card_prelinks'
  - 'for_each_card_rtds'
  - 'for_each_card_rtds_safe'
-  - 'for_each_card_widgets'
-  - 'for_each_card_widgets_safe'
  - 'for_each_cgroup_storage_type'
  - 'for_each_child_of_node'
  - 'for_each_clear_bit'
@@ -166,7 +156,6 @@ ForEachMacros:
  - 'for_each_cpu_and'
  - 'for_each_cpu_not'
  - 'for_each_cpu_wrap'
-  - 'for_each_dapm_widgets'
  - 'for_each_dev_addr'
  - 'for_each_dev_scope'
  - 'for_each_displayid_db'
@@ -197,29 +186,23 @@ ForEachMacros:
  - 'for_each_ip_tunnel_rcu'
  - 'for_each_irq_nr'
  - 'for_each_link_codecs'
-  - 'for_each_link_cpus'
  - 'for_each_link_platforms'
  - 'for_each_lru'
  - 'for_each_matching_node'
  - 'for_each_matching_node_and_match'
-  - 'for_each_member'
-  - 'for_each_mem_region'
+  - '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_migratetype_order'
  - 'for_each_msi_entry'
  - 'for_each_msi_entry_safe'
  - 'for_each_net'
-  - 'for_each_net_continue_reverse'
  - 'for_each_netdev'
  - 'for_each_netdev_continue'
  - 'for_each_netdev_continue_rcu'
-  - 'for_each_netdev_continue_reverse'
  - 'for_each_netdev_feature'
  - 'for_each_netdev_in_bond_rcu'
  - 'for_each_netdev_rcu'
@@ -238,7 +221,6 @@ ForEachMacros:
  - 'for_each_node_state'
  - 'for_each_node_with_cpus'
  - 'for_each_node_with_property'
-  - 'for_each_nonreserved_multicast_dest_pgid'
  - 'for_each_of_allnodes'
  - 'for_each_of_allnodes_from'
  - 'for_each_of_cpu_node'
@@ -260,8 +242,6 @@ ForEachMacros:
  - 'for_each_pci_bridge'
  - 'for_each_pci_dev'
  - 'for_each_pci_msi_entry'
-  - 'for_each_pcm_streams'
-  - 'for_each_physmem_range'
  - 'for_each_populated_zone'
  - 'for_each_possible_cpu'
  - 'for_each_present_cpu'
@@ -271,34 +251,22 @@ ForEachMacros:
  - 'for_each_process_thread'
  - 'for_each_property_of_node'
  - '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_rtd_codec_dai'
+  - 'for_each_rtd_codec_dai_rollback'
+  - 'for_each_rtdcom'
+  - 'for_each_rtdcom_safe'
  - 'for_each_set_bit'
  - 'for_each_set_bit_from'
-  - 'for_each_set_clump8'
  - 'for_each_sg'
  - 'for_each_sg_dma_page'
  - 'for_each_sg_page'
-  - 'for_each_sgtable_dma_page'
-  - 'for_each_sgtable_dma_sg'
-  - 'for_each_sgtable_page'
-  - 'for_each_sgtable_sg'
  - 'for_each_sibling_event'
  - 'for_each_subelement'
  - 'for_each_subelement_extid'
  - 'for_each_subelement_id'
  - '__for_each_thread'
  - 'for_each_thread'
-  - 'for_each_unicast_dest_pgid'
-  - 'for_each_wakeup_source'
  - 'for_each_zone'
  - 'for_each_zone_zonelist'
  - 'for_each_zone_zonelist_nodemask'
@@ -357,13 +325,11 @@ ForEachMacros:
  - 'klp_for_each_object'
  - 'klp_for_each_object_safe'
  - 'klp_for_each_object_static'
-  - 'kunit_suite_for_each_test_case'
  - 'kvm_for_each_memslot'
  - 'kvm_for_each_vcpu'
  - 'list_for_each'
  - 'list_for_each_codec'
  - 'list_for_each_codec_safe'
-  - 'list_for_each_continue'
  - 'list_for_each_entry'
  - 'list_for_each_entry_continue'
  - 'list_for_each_entry_continue_rcu'
@@ -385,7 +351,6 @@ ForEachMacros:
  - 'llist_for_each_entry'
  - 'llist_for_each_entry_safe'
  - 'llist_for_each_safe'
-  - 'mci_for_each_dimm'
  - 'media_device_for_each_entity'
  - 'media_device_for_each_intf'
  - 'media_device_for_each_link'
@@ -411,7 +376,6 @@ ForEachMacros:
  - 'of_property_for_each_string'
  - 'of_property_for_each_u32'
  - 'pci_bus_for_each_resource'
-  - 'pcm_for_each_format'
  - 'ping_portaddr_for_each_entry'
  - 'plist_for_each'
  - 'plist_for_each_continue'
@@ -429,7 +393,6 @@ 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'
@@ -479,19 +442,12 @@ ForEachMacros:
  - 'v4l2_m2m_for_each_src_buf'
  - 'v4l2_m2m_for_each_src_buf_safe'
  - 'virtio_device_for_each_vq'
-  - 'while_for_each_ftrace_op'
  - 'xa_for_each'
  - 'xa_for_each_marked'
-  - 'xa_for_each_range'
  - 'xa_for_each_start'
  - 'xas_for_each'
  - 'xas_for_each_conflict'
  - 'xas_for_each_marked'
-  - 'xbc_array_for_each_value'
-  - 'xbc_for_each_key_value'
-  - 'xbc_node_for_each_array_value'
-  - 'xbc_node_for_each_child'
-  - 'xbc_node_for_each_key_value'
  - 'zorro_for_each_dev'

 #IncludeBlocks: Preserve # Unknown to clang-format-5.0
@@ -509,7 +465,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
+NamespaceIndentation: Inner
 #ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
 ObjCBlockIndentWidth: 8
 ObjCSpaceAfterProperty: true
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,2 @@
 *.c   diff=cpp
 *.h   diff=cpp
-*.dtsi diff=dts
-*.dts  diff=dts
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-# SPDX-License-Identifier: GPL-2.0-only
 #
 # NOTE! Don't add files that are generated in specific
 # subdirectories here. Add them in the ".gitignore" file
@@ -36,6 +35,7 @@
 *.mod.c
 *.o
 *.o.*
+*.order
 *.patch
 *.s
 *.so
@@ -45,10 +45,8 @@
 *.tab.[ch]
 *.tar
 *.xz
-*.zst
 Module.symvers
 modules.builtin
-modules.order

 #
 # Top-level generic files
@@ -58,13 +56,11 @@ modules.order
 /linux
 /vmlinux
 /vmlinux.32
-/vmlinux.symvers
 /vmlinux-gdb.py
 /vmlinuz
 /System.map
 /Module.markers
 /modules.builtin.modinfo
-/modules.nsdeps

 #
 # RPM spec file (make rpm-pkg)
@@ -145,14 +141,8 @@ x509.genkey
 /allrandom.config
 /allyes.config

-# Kconfig savedefconfig output
-/defconfig
-
 # Kdevelop4
 *.kdev4

 # Clang's compilation database file
 /compile_commands.json
-
-# Documentation toolchain
-sphinx_*/
--- a/.mailmap
+++ b/.mailmap
@@ -2,163 +2,112 @@
 # This list is used by git-shortlog to fix a few botched name translations
 # in the git archive, either because the author's full name was messed up
 # and/or not always written the same way, making contributions from the
-# same person appearing not to be so or badly displayed. Also allows for
-# old email addresses to map to new email addresses.
+# same person appearing not to be so or badly displayed.
 #
-# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
-#
-# 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>
-Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
 Adrian Bunk <bunk@stusta.de>
+Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
 Alan Cox <alan@lxorguk.ukuu.org.uk>
 Alan Cox <root@hraefn.swansea.linux.org.uk>
-Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
 Aleksey Gorelov <aleksey_gorelov@phoenix.com>
-Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
-Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
-Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
-Alexandre Belloni <alexandre.belloni@bootlin.com> <alexandre.belloni@free-electrons.com>
-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>
+Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
 Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
 Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
+Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
+Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
+Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
 Al Viro <viro@ftp.linux.org.uk>
 Al Viro <viro@zenIV.linux.org.uk>
-Andi Kleen <ak@linux.intel.com> <ak@suse.de>
 Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
 Andreas Herrmann <aherrman@de.ibm.com>
-Andrew Morton <akpm@linux-foundation.org>
-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>
+Andrew Morton <akpm@linux-foundation.org>
+Andrew Vasquez <andrew.vasquez@qlogic.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>
+Antoine Tenart <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>
 Arnaud Patard <arnaud.patard@rtp-net.org>
 Arnd Bergmann <arnd@arndb.de>
 Axel Dyks <xl@xlsigned.net>
 Axel Lin <axel.lin@gmail.com>
-Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
 Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
+Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
 Ben Gardner <bgardner@wabtec.com>
 Ben M Cahill <ben.m.cahill@intel.com>
 Björn Steinbrink <B.Steinbrink@gmx.de>
-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>
 Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
+Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
+Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
 Brian Avery <b.avery@hp.com>
 Brian King <brking@us.ibm.com>
-Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
-Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
-Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
-Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
-Christophe Ricard <christophe.ricard@gmail.com>
 Christoph Hellwig <hch@lst.de>
+Christophe Ricard <christophe.ricard@gmail.com>
 Corey Minyard <minyard@acm.org>
 Damian Hobson-Garcia <dhobsong@igel.co.jp>
-Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
+Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
+Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
 Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
 Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
-Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
-Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
+Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
 Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
 David Brownell <david-b@pacbell.net>
 David Woodhouse <dwmw2@shinybook.infradead.org>
+Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
+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>
-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 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 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>
-Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
 Felipe W Damasio <felipewd@terra.com.br>
 Felix Kuhling <fxkuehl@gmx.de>
 Felix Moeller <felix@derklecks.de>
 Filipe Lautert <filipe@icewall.org>
 Franck Bui-Huu <vagabon.xyz@gmail.com>
+Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
 Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
 Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
-Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
 Frank Zago <fzago@systemfabricworks.com>
-Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
-Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
-Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
-Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
-Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
 Greg Kroah-Hartman <greg@echidna.(none)>
 Greg Kroah-Hartman <gregkh@suse.de>
 Greg Kroah-Hartman <greg@kroah.com>
-Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
 Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
-Gustavo Padovan <gustavo@las.ic.unicamp.br>
-Gustavo Padovan <padovan@profusion.mobi>
 Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
-Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
-Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
 Henk Vergonet <Henk.Vergonet@gmail.com>
 Henrik Kretzschmar <henne@nachtwindheim.de>
 Henrik Rydberg <rydberg@bitmath.org>
 Herbert Xu <herbert@gondor.apana.org.au>
 Jacob Shin <Jacob.Shin@amd.com>
-Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
-Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
-Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
-Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
 James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <jejb@titanic.il.steeleye.com>
 James E Wilson <wilson@specifix.com>
-James Hogan <jhogan@kernel.org> <james@albanarts.com>
 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
+James Hogan <jhogan@kernel.org> <james@albanarts.com>
 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>
-<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
-Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
-Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
-Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
-Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
-<jean-philippe@linaro.org> <jean-philippe.brucker@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>
 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>
-Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
-Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
-Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
-Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.cz>
-Jiri Slaby <jirislaby@kernel.org> <xslaby@fi.muni.cz>
 Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
 Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
@@ -172,40 +121,28 @@ 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>
-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>
 Koushik <raghavendra.koushik@neterion.com>
-Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
+Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
-Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
-Leonid I Ananiev <leonid.i.ananiev@intel.com>
 Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
 Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
-Leon Romanovsky <leon@kernel.org> <leonro@nvidia.com>
+Leonid I Ananiev <leonid.i.ananiev@intel.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>
+Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
 Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
-Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
+Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
 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>
+Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.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>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
+Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
 Mathieu Othacehe <m.othacehe@gmail.com>
 Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
 Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
@@ -215,25 +152,22 @@ Matthew Wilcox <willy@infradead.org> <willy@debian.org>
 Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
 Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
 Matthieu CASTET <castet.matthieu@free.fr>
-Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
-Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
-Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
-Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
-Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
+Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
-Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
 Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
+Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
+Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
+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>
-Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
-Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
-Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>
 Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
 Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>
 Mitesh shah <mshah@teja.com>
@@ -244,102 +178,79 @@ Morten Welinder <welinder@darter.rentec.com>
 Morten Welinder <welinder@troll.com>
 Mythri P K <mythripk@ti.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>
 Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
+Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
+Patrick Mochel <mochel@digitalimplant.org>
+Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
+Peter A Jonsson <pj@ludd.ltu.se>
+Peter Oruba <peter@oruba.de>
+Peter Oruba <peter.oruba@amd.com>
+Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
+Praveen BP <praveenbp@ti.com>
+Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
+Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.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>
 Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
 Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
-Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
-Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
-Patrick Mochel <mochel@digitalimplant.org>
-Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
-Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
-Paul E. McKenney <paulmck@kernel.org> <paul.mckenney@linaro.org>
-Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.ibm.com>
-Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.vnet.ibm.com>
-Paul E. McKenney <paulmck@kernel.org> <paulmck@us.ibm.com>
-Peter A Jonsson <pj@ludd.ltu.se>
-Peter Oruba <peter.oruba@amd.com>
-Peter Oruba <peter@oruba.de>
-Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
-Praveen BP <praveenbp@ti.com>
-Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
-Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
-Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
-Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
-Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
 Rajesh Shah <rajesh.shah@intel.com>
 Ralf Baechle <ralf@linux-mips.org>
 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
 Rémi Denis-Courmont <rdenis@simphalempin.com>
-Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
-Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
-Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
+Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
 Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
 Rudolf Marek <R.Marek@sh.cvut.cz>
 Rui Saraiva <rmps@joel.ist.utl.pt>
 Sachin P Sant <ssant@in.ibm.com>
-Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
-Sam Ravnborg <sam@mars.ravnborg.org>
-Santosh Shilimkar <santosh.shilimkar@oracle.org>
-Santosh Shilimkar <ssantosh@kernel.org>
 Sarangdhar Joshi <spjoshi@codeaurora.org>
+Sam Ravnborg <sam@mars.ravnborg.org>
+Santosh Shilimkar <ssantosh@kernel.org>
+Santosh Shilimkar <santosh.shilimkar@oracle.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>
-Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
+Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
 Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
 Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
 Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
 Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
-Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@osdl.org>
-Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
-Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>
 Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
 Subhash Jadavani <subhashj@codeaurora.org>
 Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
 Sumit Semwal <sumit.semwal@ti.com>
-Takashi YOSHII <takashi.yoshii.zj@renesas.com>
 Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Thomas Pedersen <twp@codeaurora.org>
-Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
-Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
 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>
+TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
 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>
 Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
 Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
 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>
-Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>
+Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
 Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
-Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
-WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>
+Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
+Takashi YOSHII <takashi.yoshii.zj@renesas.com>
 Will Deacon <will@kernel.org> <will.deacon@arm.com>
-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>
+Gustavo Padovan <gustavo@las.ic.unicamp.br>
+Gustavo Padovan <padovan@profusion.mobi>
+Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
+Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
--- a/2
+++ b/2
@@ -16,5 +16,3 @@ In addition, other licenses may also apply. Please see:
 	Documentation/process/license-rules.rst

 for more details.
-
-All contributions to the Linux Kernel are subject to this COPYING file.
--- a/180
+++ b/180
@@ -34,7 +34,7 @@ S: Romania

 N: Mark Adler
 E: madler@alumni.caltech.edu
-W: https://alumnus.caltech.edu/~madler/
+W: http://alumnus.caltech.edu/~madler/
 D: zlib decompression

 N: Monalisa Agrawal
@@ -62,7 +62,7 @@ S: United Kingdom

 N: Werner Almesberger
 E: werner@almesberger.net
-W: https://www.almesberger.net/
+W: http://www.almesberger.net/
 D: dosfs, LILO, some fd features, ATM, various other hacks here and there
 S: Buenos Aires
 S: Argentina
@@ -96,9 +96,9 @@ S: USA

 N: Erik Andersen
 E: andersen@codepoet.org
-W: https://www.codepoet.org/
+W: http://www.codepoet.org/
 P: 1024D/30D39057 1BC4 2742 E885 E4DE 9301  0C82 5F9B 643E 30D3 9057
-D: Maintainer of ide-cd and Uniform CD-ROM driver,
+D: Maintainer of ide-cd and Uniform CD-ROM driver, 
 D: ATAPI CD-Changer support, Major 2.1.x CD-ROM update.
 S: 352 North 525 East
 S: Springville, Utah 84663
@@ -114,7 +114,7 @@ S: Canada K2P 0X3

 N: H. Peter Anvin
 E: hpa@zytor.com
-W: https://www.zytor.com/~hpa/
+W: http://www.zytor.com/~hpa/
 P: 2047/2A960705 BA 03 D3 2C 14 A8 A8 BD  1E DF FE 69 EE 35 BD 74
 D: Author of the SYSLINUX boot loader, maintainer of the linux.* news
 D: hierarchy and the Linux Device List; various kernel hacks
@@ -124,7 +124,7 @@ S: USA

 N: Andrea Arcangeli
 E: andrea@suse.de
-W: https://www.kernel.org/pub/linux/kernel/people/andrea/
+W: http://www.kernel.org/pub/linux/kernel/people/andrea/
 P: 1024D/68B9CB43 13D9 8355 295F 4823 7C49  C012 DFA1 686E 68B9 CB43
 P: 1024R/CB4660B9 CC A0 71 81 F4 A0 63 AC  C0 4B 81 1D 8C 15 C8 E5
 D: Parport hacker
@@ -191,10 +191,6 @@ 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.
@@ -263,7 +259,7 @@ N: Paul Barton-Davis
 E: pbd@op.net
 D: Driver for WaveFront soundcards (Turtle Beach Maui, Tropez, Tropez+)
 D: Various bugfixes and changes to sound drivers
-S: USA
+S: USA 

 N: Carlos Henrique Bauer
 E: chbauer@acm.org
@@ -343,7 +339,7 @@ S: Haifa, Israel

 N: Johannes Berg
 E: johannes@sipsolutions.net
-W: https://johannes.sipsolutions.net/
+W: http://johannes.sipsolutions.net/
 P: 4096R/7BF9099A C0EB C440 F6DA 091C 884D  8532 E0F3 73F3 7BF9 099A
 D: powerpc & 802.11 hacker

@@ -380,7 +376,7 @@ D: Original author of the Linux networking code

 N: Anton Blanchard
 E: anton@samba.org
-W: https://samba.org/~anton/
+W: http://samba.org/~anton/
 P: 1024/8462A731 4C 55 86 34 44 59 A7 99  2B 97 88 4A 88 9A 0D 97
 D: sun4 port, Sparc hacker

@@ -513,7 +509,7 @@ S: Sweden

 N: Paul Bristow
 E: paul@paulbristow.net
-W: https://paulbristow.net/linux/idefloppy.html
+W: http://paulbristow.net/linux/idefloppy.html
 D: Maintainer of IDE/ATAPI floppy driver

 N: Stefano Brivio
@@ -522,7 +518,7 @@ D: Broadcom B43 driver

 N: Dominik Brodowski
 E: linux@brodo.de
-W: https://www.brodo.de/
+W: http://www.brodo.de/
 P: 1024D/725B37C6  190F 3E77 9C89 3B6D BECD  46EE 67C3 0308 725B 37C6
 D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
 S: Tuebingen, Germany
@@ -571,11 +567,6 @@ D: Original author of Amiga FFS filesystem
 S: Orlando, Florida
 S: USA

-N: Paul Burton
-E: paulburton@kernel.org
-W: https://pburton.com
-D: MIPS maintainer 2018-2020
-
 N: Lennert Buytenhek
 E: kernel@wantstofly.org
 D: Original (2.4) rewrite of the ethernet bridging code
@@ -740,11 +731,6 @@ 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
@@ -765,7 +751,7 @@ S: Santa Cruz, California
 S: USA

 N: Luis Correia
-E: luisfcorreia@gmail.com
+E: lfcorreia@users.sf.net
 D: Ralink rt2x00 WLAN driver
 S: Belas, Portugal

@@ -854,12 +840,6 @@ 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/
@@ -880,7 +860,7 @@ D: Promise DC4030VL caching HD controller drivers

 N: Todd J. Derr
 E: tjd@fore.com
-W: https://www.wordsmith.org/~tjd
+W: http://www.wordsmith.org/~tjd
 D: Random console hacks and other miscellaneous stuff
 S: 3000 FORE Drive
 S: Warrendale, Pennsylvania 15086
@@ -909,8 +889,8 @@ S: USA

 N: Matt Domsch
 E: Matt_Domsch@dell.com
-W: https://www.dell.com/linux
-W: https://domsch.com/linux
+W: http://www.dell.com/linux
+W: http://domsch.com/linux
 D: Linux/IA-64
 D: Dell PowerEdge server, SCSI layer, misc drivers, and other patches
 S: Dell Inc.
@@ -1007,7 +987,7 @@ S: USA

 N: Randy Dunlap
 E: rdunlap@infradead.org
-W: https://www.infradead.org/~rdunlap/
+W: http://www.infradead.org/~rdunlap/
 D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
 D: x86 SMP, ACPI, bootflag hacking
 D: documentation, builds
@@ -1172,7 +1152,7 @@ S: Germany

 N: Jeremy Fitzhardinge
 E: jeremy@goop.org
-W: https://www.goop.org/~jeremy
+W: http://www.goop.org/~jeremy
 D: author of userfs filesystem
 D: Improved mmap and munmap handling
 D: General mm minor tidyups
@@ -1210,7 +1190,7 @@ N: Daniel J. Frasnelli
 E: dfrasnel@alphalinux.org
 W: http://www.alphalinux.org/
 P: 1024/3EF87611 B9 F1 44 50 D3 E8 C2 80  DA E5 55 AA 56 7C 42 DA
-D: DEC Alpha hacker
+D: DEC Alpha hacker 
 D: Miscellaneous bug squisher

 N: Jim Freeman
@@ -1310,7 +1290,7 @@ S: P.O. Box 76, Epping
 S: New South Wales, 2121
 S: Australia

-N: Carlos E. Gorges
+N: Carlos E. Gorges 
 E: carlos@techlinux.com.br
 D: fix smp support on cmpci driver
 P: 2048G/EA3C4B19 FF31 33A6 0362 4915 B7EB  E541 17D0 0379 EA3C 4B19
@@ -1351,7 +1331,7 @@ E: wgreathouse@smva.com
 E: wgreathouse@myfavoritei.com
 D: Current Belkin USB Serial Adapter F5U103 hacker
 D: Kernel hacker, embedded systems
-S: 7802 Fitzwater Road
+S: 7802 Fitzwater Road   
 S: Brecksville, OH  44141-1334
 S: USA

@@ -1392,7 +1372,7 @@ N: Grant Guenther
 E: grant@torque.net
 W: http://www.torque.net/linux-pp.html
 D: original author of ppa driver for parallel port ZIP drive
-D: original architect of the parallel-port sharing scheme
+D: original architect of the parallel-port sharing scheme 
 D: PARIDE subsystem: drivers for parallel port IDE & ATAPI devices
 S: 44 St. Joseph Street, Suite 506
 S: Toronto, Ontario, M4Y 2W4
@@ -1475,7 +1455,7 @@ S: The Netherlands

 N: Oliver Hartkopp
 E: oliver.hartkopp@volkswagen.de
-W: https://www.volkswagen.de
+W: http://www.volkswagen.de
 D: Controller Area Network (network layer core)
 S: Brieffach 1776
 S: 38436 Wolfsburg
@@ -1534,7 +1514,7 @@ N: Benjamin Herrenschmidt
 E: benh@kernel.crashing.org
 D: Various parts of PPC/PPC64 & PowerMac
 S: 312/107 Canberra Avenue
-S: Griffith, ACT 2603
+S: Griffith, ACT 2603 
 S: Australia

 N: Andreas Herrmann
@@ -1614,13 +1594,13 @@ S: Germany

 N: Kenji Hollis
 E: kenji@bitgate.com
-W: https://www.bitgate.com/
+W: http://www.bitgate.com/
 D: Berkshire PC Watchdog Driver
 D: Small/Industrial Driver Project

 N: Nick Holloway
 E: Nick.Holloway@pyrites.org.uk
-W: https://www.pyrites.org.uk/
+W: http://www.pyrites.org.uk/
 P: 1024/36115A04 F4E1 3384 FCFD C055 15D6  BA4C AB03 FBF8 3611 5A04
 D: Occasional Linux hacker...
 S: (ask for current address)
@@ -1657,10 +1637,6 @@ S: Panoramastrasse 18
 S: D-69126 Heidelberg
 S: Germany

-N: Simon Horman
-M: horms@verge.net.au
-D: Renesas ARM/ARM64 SoC maintainer
-
 N: Christopher Horn
 E: chorn@warwick.net
 D: Miscellaneous sysctl hacks
@@ -1670,7 +1646,7 @@ S: USA

 N: Harald Hoyer
 E: harald@redhat.com
-W: https://www.harald-hoyer.de
+W: http://www.harald-hoyer.de
 D: ip_masq_quake
 D: md boot support
 S: Am Strand 5
@@ -1836,7 +1812,7 @@ S: Hungary
 N: Bernhard Kaindl
 E: bkaindl@netway.at
 E: edv@bartelt.via.at
-D: Author of a menu based configuration tool, kmenu, which
+D: Author of a menu based configuration tool, kmenu, which 
 D: is the predecessor of 'make menuconfig' and 'make xconfig'.
 D: digiboard driver update(modularisation work and 2.1.x upd)
 S: Tallak 95
@@ -1871,7 +1847,7 @@ E: kas@fi.muni.cz
 D: Author of the COSA/SRP sync serial board driver.
 D: Port of the syncppp.c from the 2.0 to the 2.1 kernel.
 P: 1024/D3498839 0D 99 A7 FB 20 66 05 D7  8B 35 FC DE 05 B1 8A 5E
-W: https://www.fi.muni.cz/~kas/
+W: http://www.fi.muni.cz/~kas/
 S: c/o Faculty of Informatics, Masaryk University
 S: Botanicka' 68a
 S: 602 00 Brno
@@ -1895,9 +1871,8 @@ S: The Netherlands

 N: Martin Kepplinger
 E: martink@posteo.de
-E: martin.kepplinger@puri.sm
+E: martin.kepplinger@ginzinger.com
 W: http://www.martinkepplinger.com
-P: 4096R/5AB387D3 F208 2B88 0F9E 4239 3468  6E3F 5003 98DF 5AB3 87D3
 D: mma8452 accelerators iio driver
 D: pegasus_notetaker input driver
 D: Kernel fixes and cleanups
@@ -1921,15 +1896,6 @@ 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
@@ -1966,10 +1932,6 @@ 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>
@@ -2027,7 +1989,7 @@ W: http://www.xos.nl/
 D: IP transparent proxy support
 S: X/OS Experts in Open Systems BV
 S: Kruislaan 419
-S: 1098 VA Amsterdam
+S: 1098 VA Amsterdam 
 S: The Netherlands

 N: Goran Koruga
@@ -2045,7 +2007,7 @@ S: Prague, Czech Republic

 N: Gene Kozin
 E: 74604.152@compuserve.com
-W: https://www.sangoma.com
+W: http://www.sangoma.com
 D: WAN Router & Sangoma WAN drivers
 S: Sangoma Technologies Inc.
 S: 7170 Warden Avenue, Unit 2
@@ -2099,7 +2061,7 @@ S: Germany

 N: Andrzej M. Krzysztofowicz
 E: ankry@mif.pg.gda.pl
-D: Some 8-bit XT disk driver and devfs hacking
+D: Some 8-bit XT disk driver and devfs hacking 
 D: Aladdin 1533/1543(C) chipset IDE
 D: PIIX chipset IDE
 S: ul. Matemblewska 1B/10
@@ -2140,7 +2102,7 @@ D: Original author of software suspend

 N: Jaroslav Kysela
 E: perex@perex.cz
-W: https://www.perex.cz
+W: http://www.perex.cz
 D: Original Author and Maintainer for HP 10/100 Mbit Network Adapters
 D: ISA PnP
 S: Sindlovy Dvory 117
@@ -2344,7 +2306,7 @@ S: Finland

 N: Daniel J. Maas
 E: dmaas@dcine.com
-W: https://www.maasdigital.com
+W: http://www.maasdigital.com
 D: dv1394

 N: Hamish Macdonald
@@ -2474,7 +2436,7 @@ E: mge@EZ-Darmstadt.Telekom.de
 D: Logical Volume Manager
 S: Bartningstr. 12
 S: 64289 Darmstadt
-S: Germany
+S: Germany 

 N: Mark W. McClelland
 E: mmcclell@bigfoot.com
@@ -2558,7 +2520,7 @@ E: meskes@debian.org
 P: 1024/04B6E8F5 6C 77 33 CA CC D6 22 03  AB AB 15 A3 AE AD 39 7D
 D: Kernel hacker. PostgreSQL hacker. Software watchdog daemon.
 D: Maintainer of several Debian packages
-S: Th.-Heuss-Str. 61
+S: Th.-Heuss-Str. 61 
 S: D-41812 Erkelenz
 S: Germany

@@ -2675,7 +2637,7 @@ D: bug fixes, documentation, minor hackery

 N: Paul Moore
 E: paul@paul-moore.com
-W: https://www.paul-moore.com
+W: http://www.paul-moore.com
 D: NetLabel, SELinux, audit

 N: James Morris
@@ -2796,7 +2758,7 @@ E: neuffer@goofy.zdv.uni-mainz.de
 W: http://www.i-Connect.Net/~mike/
 D: Developer and maintainer of the EATA-DMA SCSI driver
 D: Co-developer EATA-PIO SCSI driver
-D: /proc/scsi and assorted other snippets
+D: /proc/scsi and assorted other snippets 
 S: Zum Schiersteiner Grund 2
 S: 55127 Mainz
 S: Germany
@@ -2814,7 +2776,7 @@ N: David C. Niemi
 E: niemi@tux.org
 W: http://www.tux.org/~niemi/
 D: Assistant maintainer of Mtools, fdutils, and floppy driver
-D: Administrator of Tux.Org Linux Server, https://www.tux.org
+D: Administrator of Tux.Org Linux Server, http://www.tux.org
 S: 2364 Old Trail Drive
 S: Reston, Virginia 20191
 S: USA
@@ -2863,10 +2825,6 @@ 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.
@@ -2882,7 +2840,7 @@ S: USA

 N: Mikulas Patocka
 E: mikulas@artax.karlin.mff.cuni.cz
-W: https://artax.karlin.mff.cuni.cz/~mikulas/
+W: http://artax.karlin.mff.cuni.cz/~mikulas/
 P: 1024/BB11D2D5 A0 F1 28 4A C4 14 1E CF  92 58 7A 8F 69 BC A4 D3
 D: Read/write HPFS filesystem
 S: Weissova 8
@@ -2904,7 +2862,7 @@ D: RFC2385 Support for TCP

 N: Barak A. Pearlmutter
 E: bap@cs.unm.edu
-W: https://www.cs.unm.edu/~bap/
+W: http://www.cs.unm.edu/~bap/
 P: 512/602D785D 9B A1 83 CD EE CB AD 93  20 C6 4C B7 F5 E9 60 D4
 D: Author of mark-and-sweep GC integrated by Alan Cox
 S: Computer Science Department
@@ -3034,7 +2992,7 @@ D: Embedded PowerPC 4xx/6xx/7xx/74xx support
 S: Chandler, Arizona 85249
 S: USA

-N: Frederic Potter
+N: Frederic Potter 
 E: fpotter@cirpack.com
 D: Some PCI kernel support

@@ -3067,7 +3025,7 @@ S: United Kingdom

 N: Daniel Quinlan
 E: quinlan@pathname.com
-W: https://www.pathname.com/~quinlan/
+W: http://www.pathname.com/~quinlan/
 D: FSSTND coordinator; FHS editor
 D: random Linux documentation, patches, and hacks
 S: 4390 Albany Drive #41A
@@ -3136,16 +3094,14 @@ W: http://www.qsl.net/dl1bke/
 D: Generic Z8530 driver, AX.25 DAMA slave implementation
 D: Several AX.25 hacks

-N: Ricardo Ribalda
-E: ribalda@kernel.org
+N: Ricardo Ribalda Delgado
+E: ricardo.ribalda@gmail.com
 W: http://ribalda.com
 D: PLX USB338x driver
 D: PCA9634 driver
 D: Option GTM671WFS
 D: Fintek F81216A
 D: AD5761 iio driver
-D: TI DAC7612 driver
-D: Sony IMX214 driver
 D: Various kernel hacks
 S: Qtechnology A/S
 S: Valby Langgade 142
@@ -3162,7 +3118,7 @@ S: France

 N: Rik van Riel
 E: riel@redhat.com
-W: https://www.surriel.com/
+W: http://www.surriel.com/
 D: Linux-MM site, Documentation/admin-guide/sysctl/*, swap/mm readaround
 D: kswapd fixes, random kernel hacker, rmap VM,
 D: nl.linux.org administrator, minor scheduler additions
@@ -3278,7 +3234,7 @@ S: Germany

 N: Paul `Rusty' Russell
 E: rusty@rustcorp.com.au
-W: https://ozlabs.org/~rusty
+W: http://ozlabs.org/~rusty
 D: Ruggedly handsome.
 D: netfilter, ipchains with Michael Neuling.
 S: 52 Moore St
@@ -3341,9 +3297,7 @@ S: France
 N: Aleksa Sarai
 E: cyphar@cyphar.com
 W: https://www.cyphar.com/
-D: /sys/fs/cgroup/pids
-D: openat2(2)
-S: Sydney, Australia
+D: `pids` cgroup subsystem

 N: Dipankar Sarma
 E: dipankar@in.ibm.com
@@ -3401,7 +3355,7 @@ S: Germany

 N: Robert Schwebel
 E: robert@schwebel.de
-W: https://www.schwebel.de
+W: http://www.schwebel.de
 D: Embedded hacker and book author,
 D: AMD Elan support for Linux
 S: Pengutronix
@@ -3467,21 +3421,21 @@ S: Klosterweg 28 / i309
 S: 76131 Karlsruhe
 S: Germany

-N: James Simmons
+N: James Simmons 
 E: jsimmons@infradead.org
-E: jsimmons@users.sf.net
+E: jsimmons@users.sf.net 
 D: Frame buffer device maintainer
 D: input layer development
 D: tty/console layer
-D: various mipsel devices
-S: 115 Carmel Avenue
+D: various mipsel devices 
+S: 115 Carmel Avenue 
 S: El Cerrito CA 94530
-S: USA
+S: USA 

 N: Jaspreet Singh
 E: jaspreet@sangoma.com
 W: www.sangoma.com
-D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards
+D: WANPIPE drivers & API Support for Sangoma S508/FT1 cards 
 S: Sangoma Technologies Inc.,
 S: 1001 Denison Street
 S: Suite 101
@@ -3505,7 +3459,7 @@ N: Craig Small
 E: csmall@triode.apana.org.au
 E: vk2xlz@gonzo.vk2xlz.ampr.org (packet radio)
 D: Gracilis PackeTwin device driver
-D: RSPF daemon
+D: RSPF daemon 
 S: 10 Stockalls Place
 S: Minto, NSW, 2566
 S: Australia
@@ -3577,7 +3531,7 @@ S: Australia
 N: Henrik Storner
 E: storner@image.dk
 W: http://www.image.dk/~storner/
-W: https://www.sslug.dk/
+W: http://www.sslug.dk/
 D: Configure script: Invented tristate for module-configuration
 D: vfat/msdos integration, kerneld docs, Linux promotion
 D: Miscellaneous bug-fixes
@@ -3611,7 +3565,7 @@ S: USA

 N: Eugene Surovegin
 E: ebs@ebshome.net
-W: https://kernel.ebshome.net/
+W: http://kernel.ebshome.net/
 P: 1024D/AE5467F1 FF22 39F1 6728 89F6 6E6C  2365 7602 F33D AE54 67F1
 D: Embedded PowerPC 4xx: EMAC, I2C, PIC and random hacks/fixes
 S: Sunnyvale, California 94085
@@ -3641,7 +3595,7 @@ S: France

 N: Urs Thuermann
 E: urs.thuermann@volkswagen.de
-W: https://www.volkswagen.de
+W: http://www.volkswagen.de
 D: Controller Area Network (network layer core)
 S: Brieffach 1776
 S: 38436 Wolfsburg
@@ -3688,7 +3642,7 @@ S: Canada K2L 1S2

 N: Andrew Tridgell
 E: tridge@samba.org
-W: https://samba.org/tridge/
+W: http://samba.org/tridge/
 D: dosemu, networking, samba
 S: 3 Ballow Crescent
 S: MacGregor A.C.T 2615
@@ -3715,7 +3669,7 @@ N: Tsu-Sheng Tsao
 E: tsusheng@scf.usc.edu
 D: IGMP(Internet Group Management Protocol) version 2
 S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
-S: Taipei
+S: Taipei 
 S: Taiwan 112
 S: Republic of China
 S: 24335 Delta Drive
@@ -3876,7 +3830,7 @@ D: Produced the Slackware distribution, updated the SVGAlib
 D: patches for ghostscript, worked on color 'ls', etc.
 S: 301 15th Street S.
 S: Moorhead, Minnesota 56560
-S: USA
+S: USA 

 N: Jos Vos
 E: jos@xos.nl
@@ -3884,7 +3838,7 @@ W: http://www.xos.nl/
 D: Various IP firewall updates, ipfwadm
 S: X/OS Experts in Open Systems BV
 S: Kruislaan 419
-S: 1098 VA Amsterdam
+S: 1098 VA Amsterdam 
 S: The Netherlands

 N: Jeroen Vreeken
@@ -3926,7 +3880,7 @@ D: The Linux Support Team Erlangen
 N: David Weinehall
 E: tao@acc.umu.se
 P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36  E1D1 D14E 8526 DC47 CA16
-W: https://www.acc.umu.se/~tao/
+W: http://www.acc.umu.se/~tao/
 D: v2.0 kernel maintainer
 D: Fixes for the NE/2-driver
 D: Miscellaneous MCA-support
@@ -3951,7 +3905,7 @@ S: USA
 N: Harald Welte
 E: laforge@netfilter.org
 P: 1024D/30F48BFF DBDE 6912 8831 9A53 879B  9190 5DA5 C655 30F4 8BFF
-W: https://gnumonks.org/users/laforge
+W: http://gnumonks.org/users/laforge
 D: netfilter: new nat helper infrastructure
 D: netfilter: ULOG, ECN, DSCP target
 D: netfilter: TTL match
@@ -4122,7 +4076,7 @@ S: People's Repulic of China
 N: Victor Yodaiken
 E: yodaiken@fsmlabs.com
 D: RTLinux (RealTime Linux)
-S: POB 1822
+S: POB 1822 
 S: Socorro NM, 87801
 S: USA

@@ -4220,7 +4174,7 @@ D: EISA/sysfs subsystem
 S: France

 # Don't add your name here, unless you really _are_ after Marc
-# alphabetically. Leonard used to be very proud of being the
+# alphabetically. Leonard used to be very proud of being the 
 # last entry, and he'll get positively pissed if he can't even
 # be second-to-last.  (and this file really _is_ supposed to be
 # in alphabetic order)
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -1,3 +1,2 @@
-# SPDX-License-Identifier: GPL-2.0-only
 output
 *.pyc
--- a/Documentation/ABI/README
+++ b/Documentation/ABI/README
@@ -32,7 +32,7 @@ The different levels of stability are:
 	layout of the files below for details on how to do this.)

  obsolete/
-	This directory documents interfaces that are still remaining in
+  	This directory documents interfaces that are still remaining in
 	the kernel, but are marked to be removed at some later point in
 	time.  The description of the interface will document the reason
 	why it is obsolete and when it can be expected to be removed.
@@ -58,14 +58,6 @@ 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
--- a/Documentation/ABI/obsolete/sysfs-class-dax
+++ b/Documentation/ABI/obsolete/sysfs-class-dax
@@ -8,11 +8,11 @@ Description:	Device DAX is the device-centric analogue of Filesystem
 		system.  Device DAX is strict, precise and predictable.
 		Specifically this interface:

-		1. Guarantees fault granularity with respect to a given
-		   page size (pte, pmd, or pud) set at configuration time.
+		1/ Guarantees fault granularity with respect to a given
+		page size (pte, pmd, or pud) set at configuration time.

-		2. Enforces deterministic behavior by being strict about
-		   what fault scenarios are supported.
+		2/ Enforces deterministic behavior by being strict about
+		what fault scenarios are supported.

 		The /sys/class/dax/ interface enumerates all the
 		device-dax instances in the system. The ABI is
--- a/Documentation/ABI/obsolete/sysfs-cpuidle
+++ b/Documentation/ABI/obsolete/sysfs-cpuidle
@@ -1,9 +0,0 @@
-What:		/sys/devices/system/cpu/cpuidle/current_governor_ro
-Date:		April, 2020
-Contact:	linux-pm@vger.kernel.org
-Description:
-	current_governor_ro shows current using cpuidle governor, but read only.
-	with the update that cpuidle governor can be changed at runtime in default,
-	both current_governor and current_governor_ro co-exist under
-	/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make
-	current_governor_ro obselete.
--- a/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
+++ b/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
@@ -7,13 +7,10 @@ Description:	It is possible to switch the cpi setting of the mouse with the
 		setting reported by the mouse. This number has to be further
 		processed to receive the real dpi value:

-		===== ====
 		VALUE DPI
-		===== ====
 		1     400
 		2     800
 		4     1600
-		===== ====

 		This file is readonly.
 		Has never been used. If bookkeeping is done, it's done in userland tools.
--- a/Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt
+++ b/Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt
@@ -1,22 +0,0 @@
-These files allow sending arbitrary IPC commands to the PMC/SCU which
-may be dangerous. These will be removed eventually and should not be
-used in any new applications.
-
-What:		/sys/bus/platform/devices/INT34D2:00/simplecmd
-Date:		Jun 2015
-KernelVersion:	4.1
-Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>
-Description:	This interface allows userspace to send an arbitrary
-		IPC command to the PMC/SCU.
-
-		Format: %d %d where first number is command and
-		second number is subcommand.
-
-What:		/sys/bus/platform/devices/INT34D2:00/northpeak
-Date:		Jun 2015
-KernelVersion:	4.1
-Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>
-Description:	This interface allows userspace to enable and disable
-		Northpeak through the PMC/SCU.
-
-		Format: %u.
--- a/Documentation/ABI/obsolete/sysfs-gpio
+++ b/Documentation/ABI/obsolete/sysfs-gpio
@@ -13,8 +13,6 @@ Description:
  GPIOs are identified as they are inside the kernel, using integers in
  the range 0..INT_MAX.  See Documentation/admin-guide/gpio for more information.

-  ::
-
    /sys/class/gpio
 	/export ... asks the kernel to export a GPIO to userspace
 	/unexport ... to return a GPIO to the kernel
--- a/Documentation/ABI/obsolete/sysfs-kernel-fadump_enabled
+++ b/Documentation/ABI/obsolete/sysfs-kernel-fadump_enabled
@@ -1,9 +0,0 @@
-This ABI is renamed and moved to a new location /sys/kernel/fadump/enabled.
-
-What:		/sys/kernel/fadump_enabled
-Date:		Feb 2012
-Contact:	linuxppc-dev@lists.ozlabs.org
-Description:	read only
-		Primarily used to identify whether the FADump is enabled in
-		the kernel or not.
-User:		Kdump service
--- a/Documentation/ABI/obsolete/sysfs-kernel-fadump_registered
+++ b/Documentation/ABI/obsolete/sysfs-kernel-fadump_registered
@@ -1,10 +0,0 @@
-This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬
-
-What:		/sys/kernel/fadump_registered
-Date:		Feb 2012
-Contact:	linuxppc-dev@lists.ozlabs.org
-Description:	read/write
-		Helps to control the dump collect feature from userspace.
-		Setting 1 to this file enables the system to collect the
-		dump and 0 to disable it.
-User:		Kdump service
--- a/Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem
+++ b/Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem
@@ -1,10 +0,0 @@
-This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬
-
-What:		/sys/kernel/fadump_release_mem
-Date:		Feb 2012
-Contact:	linuxppc-dev@lists.ozlabs.org
-Description:	write only
-		This is a special sysfs file and only available when
-		the system is booted to capture the vmcore using FADump.
-		It is used to release the memory reserved by FADump to
-		save the crash dump.
--- a/Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
+++ b/Documentation/ABI/obsolete/sysfs-selinux-checkreqprot
@@ -1,23 +0,0 @@
-What:		/sys/fs/selinux/checkreqprot
-Date:		April 2005 (predates git)
-KernelVersion:	2.6.12-rc2 (predates git)
-Contact:	selinux@vger.kernel.org
-Description:
-
-	The selinuxfs "checkreqprot" node allows SELinux to be configured
-	to check the protection requested by userspace for mmap/mprotect
-	calls instead of the actual protection applied by the kernel.
-	This was a compatibility mechanism for legacy userspace and
-	for the READ_IMPLIES_EXEC personality flag.  However, if set to
-	1, it weakens security by allowing mappings to be made executable
-	without authorization by policy.  The default value of checkreqprot
-	at boot was changed starting in Linux v4.4 to 0 (i.e. check the
-	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 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
-	but will discard writes of the "0" value and will reject writes of the
-	"1" value when this mechanism is removed.
--- a/Documentation/ABI/obsolete/sysfs-selinux-disable
+++ b/Documentation/ABI/obsolete/sysfs-selinux-disable
@@ -1,26 +0,0 @@
-What:		/sys/fs/selinux/disable
-Date:		April 2005 (predates git)
-KernelVersion:	2.6.12-rc2 (predates git)
-Contact:	selinux@vger.kernel.org
-Description:
-
-	The selinuxfs "disable" node allows SELinux to be disabled at runtime
-	prior to a policy being loaded into the kernel.  If disabled via this
-	mechanism, SELinux will remain disabled until the system is rebooted.
-
-	The preferred method of disabling SELinux is via the "selinux=0" boot
-	parameter, but the selinuxfs "disable" node was created to make it
-	easier for systems with primitive bootloaders that did not allow for
-	easy modification of the kernel command line.  Unfortunately, allowing
-	for SELinux to be disabled at runtime makes it difficult to secure the
-	kernel's LSM hooks using the "__ro_after_init" feature.
-
-	Thankfully, the need for the SELinux runtime disable appears to be
-	gone, the default Kconfig configuration disables this selinuxfs node,
-	and only one of the major distributions, Fedora, supports disabling
-	SELinux at runtime.  Fedora is in the process of removing the
-	selinuxfs "disable" node and once that is complete we will start the
-	slow process of removing this code from the kernel.
-
-	More information on /sys/fs/selinux/disable can be found under the
-	CONFIG_SECURITY_SELINUX_DISABLE Kconfig option.
--- a/Documentation/ABI/removed/devfs
+++ b/Documentation/ABI/removed/devfs
@@ -5,7 +5,6 @@ Description:
 	devfs has been unmaintained for a number of years, has unfixable
 	races, contains a naming policy within the kernel that is
 	against the LSB, and can be replaced by using udev.
-
 	The files fs/devfs/*, include/linux/devfs_fs*.h were removed,
 	along with the assorted devfs function calls throughout the
 	kernel tree.
--- a/Documentation/ABI/removed/raw1394
+++ b/Documentation/ABI/removed/raw1394
@@ -7,7 +7,6 @@ Description:
 	to implement sensible device security policies, and its low level
 	of abstraction that required userspace clients to duplicate much
 	of the kernel's ieee1394 core functionality.
-
 	Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
 	firewire-core.

--- a/Documentation/ABI/removed/sysfs-class-rfkill
+++ b/Documentation/ABI/removed/sysfs-class-rfkill
@@ -10,4 +10,4 @@ Description:	This file was deprecated because there no longer was a way to
 		claim just control over a single rfkill instance.
 		This file was scheduled to be removed in 2012, and was removed
 		in 2016.
-Values:		0: Kernel handles events
+Values: 	0: Kernel handles events
--- a/Documentation/ABI/removed/sysfs-kernel-fadump_release_opalcore
+++ b/Documentation/ABI/removed/sysfs-kernel-fadump_release_opalcore
@@ -1,9 +0,0 @@
-This ABI is moved to /sys/firmware/opal/mpipl/release_core.
-
-What:		/sys/kernel/fadump_release_opalcore
-Date:		Sep 2019
-Contact:	linuxppc-dev@lists.ozlabs.org
-Description:	write only
-		The sysfs file is available when the system is booted to
-		collect the dump on OPAL based machine. It used to release
-		the memory used to collect the opalcore.
--- a/Documentation/ABI/removed/video1394
+++ b/Documentation/ABI/removed/video1394
@@ -8,7 +8,6 @@ Description:
 	performance issues in its first generation.  Any video1394 user had
 	to use raw1394 + libraw1394 too because video1394 did not provide
 	asynchronous I/O for device discovery and configuration.
-
 	Replaced by /dev/fw*, i.e. the <linux/firewire-cdev.h> ABI of
 	firewire-core.

--- a/Documentation/ABI/stable/firewire-cdev
+++ b/Documentation/ABI/stable/firewire-cdev
@@ -14,17 +14,13 @@ Description:
 		Each /dev/fw* is associated with one IEEE 1394 node, which can
 		be remote or local nodes.  Operations on a /dev/fw* file have
 		different scope:
-
 		  - The 1394 node which is associated with the file:
-
 			  - Asynchronous request transmission
 			  - Get the Configuration ROM
 			  - Query node ID
 			  - Query maximum speed of the path between this node
 			    and local node
-
 		  - The 1394 bus (i.e. "card") to which the node is attached to:
-
 			  - Isochronous stream transmission and reception
 			  - Asynchronous stream transmission and reception
 			  - Asynchronous broadcast request transmission
@@ -35,9 +31,7 @@ Description:
 			    manager
 			  - Query cycle time
 			  - Bus reset initiation, bus reset event reception
-
 		  - All 1394 buses:
-
 			  - Allocation of IEEE 1212 address ranges on the local
 			    link layers, reception of inbound requests to such
 			    an address range, asynchronous response transmission
@@ -49,7 +43,6 @@ Description:
 		userland implement different access permission models, some
 		operations are restricted to /dev/fw* files that are associated
 		with a local node:
-
 			  - Addition of descriptors or directories to the local
 			    nodes' Configuration ROM
 			  - PHY packet transmission and reception
@@ -62,50 +55,50 @@ Description:
 		The following file operations are supported:

 		open(2)
-		    Currently the only useful flags are O_RDWR.
+		Currently the only useful flags are O_RDWR.

 		ioctl(2)
-		    Initiate various actions.  Some take immediate effect, others
-		    are performed asynchronously while or after the ioctl returns.
-		    See the inline documentation in <linux/firewire-cdev.h> for
-		    descriptions of all ioctls.
+		Initiate various actions.  Some take immediate effect, others
+		are performed asynchronously while or after the ioctl returns.
+		See the inline documentation in <linux/firewire-cdev.h> for
+		descriptions of all ioctls.

 		poll(2), select(2), epoll_wait(2) etc.
-		    Watch for events to become available to be read.
+		Watch for events to become available to be read.

 		read(2)
-		    Receive various events.  There are solicited events like
-		    outbound asynchronous transaction completion or isochronous
-		    buffer completion, and unsolicited events such as bus resets,
-		    request reception, or PHY packet reception.  Always use a read
-		    buffer which is large enough to receive the largest event that
-		    could ever arrive.  See <linux/firewire-cdev.h> for descriptions
-		    of all event types and for which ioctls affect reception of
-		    events.
+		Receive various events.  There are solicited events like
+		outbound asynchronous transaction completion or isochronous
+		buffer completion, and unsolicited events such as bus resets,
+		request reception, or PHY packet reception.  Always use a read
+		buffer which is large enough to receive the largest event that
+		could ever arrive.  See <linux/firewire-cdev.h> for descriptions
+		of all event types and for which ioctls affect reception of
+		events.

 		mmap(2)
-		    Allocate a DMA buffer for isochronous reception or transmission
-		    and map it into the process address space.  The arguments should
-		    be used as follows:  addr = NULL, length = the desired buffer
-		    size, i.e. number of packets times size of largest packet,
-		    prot = at least PROT_READ for reception and at least PROT_WRITE
-		    for transmission, flags = MAP_SHARED, fd = the handle to the
-		    /dev/fw*, offset = 0.
+		Allocate a DMA buffer for isochronous reception or transmission
+		and map it into the process address space.  The arguments should
+		be used as follows:  addr = NULL, length = the desired buffer
+		size, i.e. number of packets times size of largest packet,
+		prot = at least PROT_READ for reception and at least PROT_WRITE
+		for transmission, flags = MAP_SHARED, fd = the handle to the
+		/dev/fw*, offset = 0.

 		Isochronous reception works in packet-per-buffer fashion except
 		for multichannel reception which works in buffer-fill mode.

 		munmap(2)
-		    Unmap the isochronous I/O buffer from the process address space.
+		Unmap the isochronous I/O buffer from the process address space.

 		close(2)
-		    Besides stopping and freeing I/O contexts that were associated
-		    with the file descriptor, back out any changes to the local
-		    nodes' Configuration ROM.  Deallocate isochronous channels and
-		    bandwidth at the IRM that were marked for kernel-assisted
-		    re- and deallocation.
+		Besides stopping and freeing I/O contexts that were associated
+		with the file descriptor, back out any changes to the local
+		nodes' Configuration ROM.  Deallocate isochronous channels and
+		bandwidth at the IRM that were marked for kernel-assisted
+		re- and deallocation.

-Users:		libraw1394;
-		libdc1394;
-		libhinawa;
+Users:		libraw1394
+		libdc1394
+		libhinawa
 		tools like linux-firewire-utils, fwhack, ...
--- a/Documentation/ABI/stable/sysfs-acpi-pmprofile
+++ b/Documentation/ABI/stable/sysfs-acpi-pmprofile
@@ -1,26 +1,22 @@
-What:		/sys/firmware/acpi/pm_profile
+What: 		/sys/firmware/acpi/pm_profile
 Date:		03-Nov-2011
 KernelVersion:	v3.2
 Contact:	linux-acpi@vger.kernel.org
-Description:	The ACPI pm_profile sysfs interface exports the platform
+Description: 	The ACPI pm_profile sysfs interface exports the platform
 		power management (and performance) requirement expectations
 		as provided by BIOS. The integer value is directly passed as
 		retrieved from the FADT ACPI table.
-
-Values:	        For possible values see ACPI specification:
+Values:         For possible values see ACPI specification:
 		5.2.9 Fixed ACPI Description Table (FADT)
 		Field: Preferred_PM_Profile

 		Currently these values are defined by spec:
-
-		== =================
-		0  Unspecified
-		1  Desktop
-		2  Mobile
-		3  Workstation
-		4  Enterprise Server
-		5  SOHO Server
-		6  Appliance PC
-		7  Performance Server
+		0 Unspecified
+		1 Desktop
+		2 Mobile
+		3 Workstation
+		4 Enterprise Server
+		5 SOHO Server
+		6 Appliance PC
+		7 Performance Server
 		>7 Reserved
-		== =================
--- a/Documentation/ABI/stable/sysfs-bus-firewire
+++ b/Documentation/ABI/stable/sysfs-bus-firewire
@@ -47,7 +47,6 @@ Description:
 		IEEE 1394 node device attribute.
 		Read-only and immutable.
 Values:		1: The sysfs entry represents a local node (a controller card).
-
 		0: The sysfs entry represents a remote node.


@@ -126,9 +125,7 @@ Description:
 		Read-only attribute, immutable during the target's lifetime.
 		Format, as exposed by firewire-sbp2 since 2.6.22, May 2007:
 		Colon-separated hexadecimal string representations of
-
 			u64 EUI-64 : u24 directory_ID : u16 LUN
-
 		without 0x prefixes, without whitespace.  The former sbp2 driver
 		(removed in 2.6.37 after being superseded by firewire-sbp2) used
 		a somewhat shorter format which was not as close to SAM.
--- a/Documentation/ABI/stable/sysfs-bus-mhi
+++ b/Documentation/ABI/stable/sysfs-bus-mhi
@@ -1,21 +0,0 @@
-What:		/sys/bus/mhi/devices/.../serialnumber
-Date:		Sept 2020
-KernelVersion:	5.10
-Contact:	Bhaumik Bhatt <bbhatt@codeaurora.org>
-Description:	The file holds the serial number of the client device obtained
-		using a BHI (Boot Host Interface) register read after at least
-		one attempt to power up the device has been done. If read
-		without having the device power on at least once, the file will
-		read all 0's.
-Users:		Any userspace application or clients interested in device info.
-
-What:		/sys/bus/mhi/devices/.../oem_pk_hash
-Date:		Sept 2020
-KernelVersion:	5.10
-Contact:	Bhaumik Bhatt <bbhatt@codeaurora.org>
-Description:	The file holds the OEM PK Hash value of the endpoint device
-		obtained using a BHI (Boot Host Interface) register read after
-		at least one attempt to power up the device has been done. If
-		read without having the device power on at least once, the file
-		will read all 0's.
-Users:		Any userspace application or clients interested in device info.
--- a/Documentation/ABI/stable/sysfs-bus-nvmem
+++ b/Documentation/ABI/stable/sysfs-bus-nvmem
@@ -9,14 +9,13 @@ Description:
 		Note: This file is only present if CONFIG_NVMEM_SYSFS
 		is enabled

-		ex::
+		ex:
+		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem

-		  hexdump /sys/bus/nvmem/devices/qfprom0/nvmem
-
-		  0000000 0000 0000 0000 0000 0000 0000 0000 0000
-		  *
-		  00000a0 db10 2240 0000 e000 0c00 0c00 0000 0c00
-		  0000000 0000 0000 0000 0000 0000 0000 0000 0000
-		  ...
-		  *
-		  0001000
+		0000000 0000 0000 0000 0000 0000 0000 0000 0000
+		*
+		00000a0 db10 2240 0000 e000 0c00 0c00 0000 0c00
+		0000000 0000 0000 0000 0000 0000 0000 0000 0000
+		...
+		*
+		0001000
--- a/Documentation/ABI/stable/sysfs-bus-usb
+++ b/Documentation/ABI/stable/sysfs-bus-usb
@@ -50,10 +50,8 @@ Description:

 		Tools can use this file and the connected_duration file to
 		compute the percentage of time that a device has been active.
-		For example::
-
-		  echo $((100 * `cat active_duration` / `cat connected_duration`))
-
+		For example,
+		echo $((100 * `cat active_duration` / `cat connected_duration`))
 		will give an integer percentage.  Note that this does not
 		account for counter wrap.
 Users:
--- a/Documentation/ABI/stable/sysfs-bus-vmbus
+++ b/Documentation/ABI/stable/sysfs-bus-vmbus
@@ -63,6 +63,13 @@ Contact:	Stephen Hemminger <sthemmin@microsoft.com>
 Description:	VCPU (sub)channel is affinitized to
 Users:		tools/hv/lsvmbus and other debugging tools

+What:		/sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
+Date:		September. 2017
+KernelVersion:	4.14
+Contact:	Stephen Hemminger <sthemmin@microsoft.com>
+Description:	VCPU (sub)channel is affinitized to
+Users:		tools/hv/lsvmbus and other debugging tools
+
 What:		/sys/bus/vmbus/devices/<UUID>/channels/<N>/in_mask
 Date:		September. 2017
 KernelVersion:	4.14
--- a/Documentation/ABI/stable/sysfs-bus-w1
+++ b/Documentation/ABI/stable/sysfs-bus-w1
@@ -6,7 +6,6 @@ Description:	Bus scanning interval, microseconds component.
 		control systems are attached/generate presence for as short as
 		100 ms - hence the tens-to-hundreds milliseconds scan intervals
 		are required.
-
-		see Documentation/w1/w1-generic.rst for detailed information.
+		see Documentation/w1/w1.generic for detailed information.
 Users:		any user space application which wants to know bus scanning
 		interval
--- a/Documentation/ABI/stable/sysfs-class-backlight
+++ b/Documentation/ABI/stable/sysfs-class-backlight
@@ -4,7 +4,6 @@ KernelVersion:	2.6.12
 Contact:	Richard Purdie <rpurdie@rpsys.net>
 Description:
 		Control BACKLIGHT power, values are FB_BLANK_* from fb.h
-
 		 - FB_BLANK_UNBLANK (0)   : power on.
 		 - FB_BLANK_POWERDOWN (4) : power off
 Users:		HAL
--- a/Documentation/ABI/stable/sysfs-class-infiniband
+++ b/Documentation/ABI/stable/sysfs-class-infiniband
@@ -8,14 +8,12 @@ Date:		Apr, 2005
 KernelVersion:	v2.6.12
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ===========================================
 		node_type:	(RO) Node type (CA, RNIC, usNIC, usNIC UDP,
 				switch or router)

 		node_guid:	(RO) Node GUID

 		sys_image_guid:	(RO) System image GUID
-		=============== ===========================================


 What:		/sys/class/infiniband/<device>/node_desc
@@ -49,7 +47,6 @@ KernelVersion:	v2.6.12
 Contact:	linux-rdma@vger.kernel.org
 Description:

-		=============== ===============================================
 		lid:		(RO) Port LID

 		rate:		(RO) Port data rate (active width * active
@@ -69,9 +66,8 @@ Description:

 		cap_mask:	(RO) Port capability mask. 2 bits here are
 				settable- IsCommunicationManagementSupported
-				(set when CM module is loaded) and IsSM (set
-				via open of issmN file).
-		=============== ===============================================
+				(set when CM module is loaded) and IsSM (set via
+				open of issmN file).


 What:		/sys/class/infiniband/<device>/ports/<port-num>/link_layer
@@ -107,7 +103,8 @@ Date:		Apr, 2005
 KernelVersion:	v2.6.12
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		**Errors info**:
+		Errors info:
+		-----------

 		symbol_error: (RO) Total number of minor link errors detected on
 		one or more physical lanes.
@@ -145,7 +142,8 @@ Description:
 		intervention. It can also indicate hardware issues or extremely
 		poor link signal integrity

-		**Data info**:
+		Data info:
+		---------

 		port_xmit_data: (RO) Total number of data octets, divided by 4
 		(lanes), transmitted on all VLs. This is 64 bit counter
@@ -178,7 +176,8 @@ Description:
 		transmitted on all VLs from the port. This may include multicast
 		packets with errors.

-		**Misc info**:
+		Misc info:
+		---------

 		port_xmit_discards: (RO) Total number of outbound packets
 		discarded by the port because the port is down or congested.
@@ -245,11 +244,9 @@ Description:
 		two umad devices and two issm devices, while a switch will have
 		one device of each type (for switch port 0).

-		======= =====================================
 		ibdev:	(RO) Show Infiniband (IB) device name

 		port:	(RO) Display port number
-		======= =====================================


 What:		/sys/class/infiniband_mad/abi_version
@@ -261,18 +258,33 @@ Description:
 		userspace ABI compatibility of umad & issm devices.


+What:		/sys/class/infiniband_cm/ucmN/ibdev
+Date:		Oct, 2005
+KernelVersion:	v2.6.14
+Contact:	linux-rdma@vger.kernel.org
+Description:
+		(RO) Display Infiniband (IB) device name
+
+
+What:		/sys/class/infiniband_cm/abi_version
+Date:		Oct, 2005
+KernelVersion:	v2.6.14
+Contact:	linux-rdma@vger.kernel.org
+Description:
+		(RO) Value is incremented if any changes are made that break
+		userspace ABI compatibility of ucm devices.
+
+
 What:		/sys/class/infiniband_verbs/uverbsN/ibdev
 What:		/sys/class/infiniband_verbs/uverbsN/abi_version
 Date:		Sept, 2005
 KernelVersion:	v2.6.14
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ===========================================
 		ibdev:		(RO) Display Infiniband (IB) device name

 		abi_version:	(RO) Show ABI version of IB device specific
 				interfaces.
-		=============== ===========================================


 What:		/sys/class/infiniband_verbs/abi_version
@@ -294,14 +306,31 @@ Date:		Apr, 2005
 KernelVersion:	v2.6.12
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ================================================
 		hw_rev:		(RO) Hardware revision number

 		hca_type:	(RO) Host Channel Adapter type: MT23108, MT25208
 				(MT23108 compat mode), MT25208 or MT25204

 		board_id:	(RO) Manufacturing board ID
-		=============== ================================================
+
+
+sysfs interface for Chelsio T3 RDMA Driver (cxgb3)
+--------------------------------------------------
+
+What:		/sys/class/infiniband/cxgb3_X/hw_rev
+What:		/sys/class/infiniband/cxgb3_X/hca_type
+What:		/sys/class/infiniband/cxgb3_X/board_id
+Date:		Feb, 2007
+KernelVersion:	v2.6.21
+Contact:	linux-rdma@vger.kernel.org
+Description:
+		hw_rev:		(RO) Hardware revision number
+
+		hca_type:	(RO) HCA type. Here it is a driver short name.
+				It should normally match the name in its bus
+				driver structure (e.g.  pci_driver::name).
+
+		board_id:	(RO) Manufacturing board id


 sysfs interface for Mellanox ConnectX HCA IB driver (mlx4)
@@ -314,13 +343,11 @@ Date:		Sep, 2007
 KernelVersion:	v2.6.24
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ===============================
 		hw_rev:		(RO) Hardware revision number

 		hca_type:	(RO) Host channel adapter type

 		board_id:	(RO) Manufacturing board ID
-		=============== ===============================


 What:		/sys/class/infiniband/mlx4_X/iov/ports/<port-num>/gids/<n>
@@ -346,7 +373,6 @@ Description:
 		example, ports/1/pkeys/10 contains the value at index 10 in port
 		1's P_Key table.

-		======================= ==========================================
 		gids/<n>:		(RO) The physical port gids n = 0..127

 		admin_guids/<n>:	(RW) Allows examining or changing the
@@ -375,7 +401,6 @@ Description:
 					guest, whenever it uses its pkey index
 					1, will actually be using the real pkey
 					index 10.
-		======================= ==========================================


 What:		/sys/class/infiniband/mlx4_X/iov/<pci-slot-num>/ports/<m>/smi_enabled
@@ -387,14 +412,12 @@ Description:
 		Enabling QP0 on VFs for selected VF/port. By default, no VFs are
 		enabled for QP0 operation.

-		================= ==== ===========================================
-		smi_enabled:	  (RO) Indicates whether smi is currently enabled
-				       for the indicated VF/port
+		smi_enabled:	(RO) Indicates whether smi is currently enabled
+				for the indicated VF/port

-		enable_smi_admin: (RW) Used by the admin to request that smi
-				       capability be enabled or disabled for the
-				       indicated VF/port. 0 = disable, 1 = enable.
-		================= ==== ===========================================
+		enable_smi_admin:(RW) Used by the admin to request that smi
+				capability be enabled or disabled for the
+				indicated VF/port. 0 = disable, 1 = enable.

 		The requested enablement will occur at the next reset of the VF
 		(e.g. driver restart on the VM which owns the VF).
@@ -411,7 +434,6 @@ KernelVersion:	v2.6.35
 Contact:	linux-rdma@vger.kernel.org
 Description:

-		=============== =============================================
 		hw_rev:		(RO) Hardware revision number

 		hca_type:	(RO) Driver short name. Should normally match
@@ -420,7 +442,6 @@ Description:

 		board_id:	(RO) Manufacturing board id. (Vendor + device
 				information)
-		=============== =============================================


 sysfs interface for Intel IB driver qib
@@ -441,7 +462,6 @@ Date:		May, 2010
 KernelVersion:	v2.6.35
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ======================================================
 		version:	(RO) Display version information of installed software
 				and drivers.

@@ -468,7 +488,6 @@ Description:
 		chip_reset:	(WO) Reset the chip if possible by writing
 				"reset" to this file. Only allowed if no user
 				contexts are open that use chip resources.
-		=============== ======================================================


 What:		/sys/class/infiniband/qibX/ports/N/sl2vl/[0-15]
@@ -488,16 +507,14 @@ Contact:	linux-rdma@vger.kernel.org
 Description:
 		Per-port congestion control. Both are binary attributes.

-		=============== ================================================
-		cc_table_bin	(RO) Congestion control table size followed by
+		cc_table_bin:	(RO) Congestion control table size followed by
 				table entries.

-		cc_settings_bin (RO) Congestion settings: port control, control
+		cc_settings_bin:(RO) Congestion settings: port control, control
 				map and an array of 16 entries for the
 				congestion entries - increase, timer, event log
 				trigger threshold and the minimum injection rate
 				delay.
-		=============== ================================================

 What:		/sys/class/infiniband/qibX/ports/N/linkstate/loopback
 What:		/sys/class/infiniband/qibX/ports/N/linkstate/led_override
@@ -510,7 +527,6 @@ Contact:	linux-rdma@vger.kernel.org
 Description:
 		[to be documented]

-		=============== ===============================================
 		loopback:	(WO)
 		led_override:	(WO)
 		hrtbt_enable:	(RW)
@@ -521,7 +537,6 @@ Description:
 				errors. Possible states are- "Initted",
 				"Present", "IB_link_up", "IB_configured" or
 				"Fatal_Hardware_Error".
-		=============== ===============================================

 What:		/sys/class/infiniband/qibX/ports/N/diag_counters/rc_resends
 What:		/sys/class/infiniband/qibX/ports/N/diag_counters/seq_naks
@@ -570,7 +585,6 @@ Contact:	Christian Benvenuti <benve@cisco.com>,
 		linux-rdma@vger.kernel.org
 Description:

-		=============== ===============================================
 		board_id:	(RO) Manufacturing board id

 		config:		(RO) Report the configuration for this PF
@@ -583,7 +597,6 @@ Description:

 		iface:		(RO) Shows which network interface this usNIC
 				entry is associated to (visible with ifconfig).
-		=============== ===============================================

 What:		/sys/class/infiniband/usnic_X/qpn/summary
 What:		/sys/class/infiniband/usnic_X/qpn/context
@@ -628,7 +641,6 @@ Date:		May, 2016
 KernelVersion:	v4.6
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== =============================================
 		hw_rev:		(RO) Hardware revision number

 		board_id:	(RO) Manufacturing board id
@@ -647,7 +659,6 @@ Description:
 				available.

 		tempsense:	(RO) Thermal sense information
-		=============== =============================================


 What:		/sys/class/infiniband/hfi1_X/ports/N/CCMgtA/cc_settings_bin
@@ -659,21 +670,19 @@ Contact:	linux-rdma@vger.kernel.org
 Description:
 		Per-port congestion control.

-		=============== ================================================
-		cc_table_bin	(RO) CCA tables used by PSM2 Congestion control
+		cc_table_bin:	(RO) CCA tables used by PSM2 Congestion control
 				table size followed by table entries. Binary
 				attribute.

-		cc_settings_bin (RO) Congestion settings: port control, control
+		cc_settings_bin:(RO) Congestion settings: port control, control
 				map and an array of 16 entries for the
 				congestion entries - increase, timer, event log
 				trigger threshold and the minimum injection rate
 				delay. Binary attribute.

-		cc_prescan	(RW) enable prescanning for faster BECN
+		cc_prescan:	(RW) enable prescanning for faster BECN
 				response. Write "on" to enable and "off" to
 				disable.
-		=============== ================================================

 What:		/sys/class/infiniband/hfi1_X/ports/N/sc2vl/[0-31]
 What:		/sys/class/infiniband/hfi1_X/ports/N/sl2sc/[0-31]
@@ -682,13 +691,11 @@ Date:		May, 2016
 KernelVersion:	v4.6
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ===================================================
 		sc2vl/:		(RO) 32 files (0 - 31) used to translate sl->vl

 		sl2sc/:		(RO) 32 files (0 - 31) used to translate sl->sc

 		vl2mtu/:	(RO) 16 files (0 - 15) used to determine MTU for vl
-		=============== ===================================================


 What:		/sys/class/infiniband/hfi1_X/sdma_N/cpu_list
@@ -699,28 +706,26 @@ Contact:	linux-rdma@vger.kernel.org
 Description:
 		sdma<N>/ contains one directory per sdma engine (0 - 15)

-		=============== ==============================================
 		cpu_list:	(RW) List of cpus for user-process to sdma
 				engine assignment.

 		vl:		(RO) Displays the virtual lane (vl) the sdma
 				engine maps to.
-		=============== ==============================================

 		This interface gives the user control on the affinity settings
 		for the device. As an example, to set an sdma engine irq
 		affinity and thread affinity of a user processes to use the
 		sdma engine, which is "near" in terms of NUMA configuration, or
-		physical cpu location, the user will do::
+		physical cpu location, the user will do:

-		  echo "3" > /proc/irq/<N>/smp_affinity_list
-		  echo "4-7" > /sys/devices/.../sdma3/cpu_list
-		  cat /sys/devices/.../sdma3/vl
-		  0
-		  echo "8" > /proc/irq/<M>/smp_affinity_list
-		  echo "9-12" > /sys/devices/.../sdma4/cpu_list
-		  cat /sys/devices/.../sdma4/vl
-		  1
+		echo "3" > /proc/irq/<N>/smp_affinity_list
+		echo "4-7" > /sys/devices/.../sdma3/cpu_list
+		cat /sys/devices/.../sdma3/vl
+		0
+		echo "8" > /proc/irq/<M>/smp_affinity_list
+		echo "9-12" > /sys/devices/.../sdma4/cpu_list
+		cat /sys/devices/.../sdma4/vl
+		1

 		to make sure that when a process runs on cpus 4,5,6, or 7, and
 		uses vl=0, then sdma engine 3 is selected by the driver, and
@@ -742,13 +747,11 @@ Date:		Jan, 2016
 KernelVersion:	v4.10
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ==== ========================
 		hw_rev:		(RO) Hardware revision number

 		hca_type:	(RO) Show HCA type (I40IW)

 		board_id:	(RO) I40IW board ID
-		=============== ==== ========================


 sysfs interface for QLogic qedr NIC Driver
@@ -761,11 +764,9 @@ KernelVersion:	v4.10
 Contact:	linux-rdma@vger.kernel.org
 Description:

-		=============== ==== ========================
 		hw_rev:		(RO) Hardware revision number

 		hca_type:	(RO) Display HCA type
-		=============== ==== ========================


 sysfs interface for VMware Paravirtual RDMA driver
@@ -779,13 +780,11 @@ KernelVersion:	v4.10
 Contact:	linux-rdma@vger.kernel.org
 Description:

-		=============== ==== =====================================
 		hw_rev:		(RO) Hardware revision number

 		hca_type:	(RO) Host channel adapter type

 		board_id:	(RO) Display PVRDMA manufacturing board ID
-		=============== ==== =====================================


 sysfs interface for Broadcom NetXtreme-E RoCE driver
@@ -797,8 +796,6 @@ Date:		Feb, 2017
 KernelVersion:	v4.11
 Contact:	linux-rdma@vger.kernel.org
 Description:
-		=============== ==== =========================
 		hw_rev:		(RO) Hardware revision number

 		hca_type:	(RO) Host channel adapter type
-		=============== ==== =========================
--- a/Documentation/ABI/stable/sysfs-class-rfkill
+++ b/Documentation/ABI/stable/sysfs-class-rfkill
@@ -2,7 +2,7 @@ rfkill - radio frequency (RF) connector kill switch support

 For details to this subsystem look at Documentation/driver-api/rfkill.rst.

-For the deprecated ``/sys/class/rfkill/*/claim`` knobs of this interface look in
+For the deprecated /sys/class/rfkill/*/claim knobs of this interface look in
 Documentation/ABI/removed/sysfs-class-rfkill.

 What: 		/sys/class/rfkill
@@ -36,10 +36,9 @@ KernelVersion	v2.6.22
 Contact:	linux-wireless@vger.kernel.org
 Description: 	Whether the soft blocked state is initialised from non-volatile
 		storage at startup.
-Values: 	A numeric value:
-
-		- 0: false
-		- 1: true
+Values: 	A numeric value.
+		0: false
+		1: true


 What:		/sys/class/rfkill/rfkill[0-9]+/state
@@ -55,7 +54,6 @@ Description: 	Current state of the transmitter.
 		through this interface. There will likely be another attempt to
 		remove it in the future.
 Values: 	A numeric value.
-
 		0: RFKILL_STATE_SOFT_BLOCKED
 			transmitter is turned off by software
 		1: RFKILL_STATE_UNBLOCKED
@@ -71,7 +69,6 @@ KernelVersion	v2.6.34
 Contact:	linux-wireless@vger.kernel.org
 Description: 	Current hardblock state. This file is read only.
 Values: 	A numeric value.
-
 		0: inactive
 			The transmitter is (potentially) active.
 		1: active
@@ -85,9 +82,7 @@ KernelVersion	v2.6.34
 Contact:	linux-wireless@vger.kernel.org
 Description:	Current softblock state. This file is read and write.
 Values: 	A numeric value.
-
 		0: inactive
 			The transmitter is (potentially) active.
-
 		1: active
 			The transmitter is turned off by software.
--- a/Documentation/ABI/stable/sysfs-class-tpm
+++ b/Documentation/ABI/stable/sysfs-class-tpm
@@ -1,7 +1,7 @@
 What:		/sys/class/tpm/tpmX/device/
 Date:		April 2005
 KernelVersion:	2.6.12
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The device/ directory under a specific TPM instance exposes
 		the properties of that TPM chip

@@ -9,7 +9,7 @@ Description:	The device/ directory under a specific TPM instance exposes
 What:		/sys/class/tpm/tpmX/device/active
 Date:		April 2006
 KernelVersion:	2.6.17
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "active" property prints a '1' if the TPM chip is accepting
 		commands. An inactive TPM chip still contains all the state of
 		an active chip (Storage Root Key, NVRAM, etc), and can be
@@ -21,7 +21,7 @@ Description:	The "active" property prints a '1' if the TPM chip is accepting
 What:		/sys/class/tpm/tpmX/device/cancel
 Date:		June 2005
 KernelVersion:	2.6.13
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "cancel" property allows you to cancel the currently
 		pending TPM command. Writing any value to cancel will call the
 		TPM vendor specific cancel operation.
@@ -29,14 +29,14 @@ Description:	The "cancel" property allows you to cancel the currently
 What:		/sys/class/tpm/tpmX/device/caps
 Date:		April 2005
 KernelVersion:	2.6.12
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "caps" property contains TPM manufacturer and version info.

-		Example output::
+		Example output:

-		  Manufacturer: 0x53544d20
-		  TCG version: 1.2
-		  Firmware version: 8.16
+		Manufacturer: 0x53544d20
+		TCG version: 1.2
+		Firmware version: 8.16

 		Manufacturer is a hex dump of the 4 byte manufacturer info
 		space in a TPM. TCG version shows the TCG TPM spec level that
@@ -46,7 +46,7 @@ Description:	The "caps" property contains TPM manufacturer and version info.
 What:		/sys/class/tpm/tpmX/device/durations
 Date:		March 2011
 KernelVersion:	3.1
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "durations" property shows the 3 vendor-specific values
 		used to wait for a short, medium and long TPM command. All
 		TPM commands are categorized as short, medium or long in
@@ -54,9 +54,9 @@ Description:	The "durations" property shows the 3 vendor-specific values
 		any longer than necessary before starting to poll for a
 		result.

-		Example output::
+		Example output:

-		  3015000 4508000 180995000 [original]
+		3015000 4508000 180995000 [original]

 		Here the short, medium and long durations are displayed in
 		usecs. "[original]" indicates that the values are displayed
@@ -69,7 +69,7 @@ Description:	The "durations" property shows the 3 vendor-specific values
 What:		/sys/class/tpm/tpmX/device/enabled
 Date:		April 2006
 KernelVersion:	2.6.17
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "enabled" property prints a '1' if the TPM chip is enabled,
 		meaning that it should be visible to the OS. This property
 		may be visible but produce a '0' after some operation that
@@ -78,7 +78,7 @@ Description:	The "enabled" property prints a '1' if the TPM chip is enabled,
 What:		/sys/class/tpm/tpmX/device/owned
 Date:		April 2006
 KernelVersion:	2.6.17
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "owned" property produces a '1' if the TPM_TakeOwnership
 		ordinal has been executed successfully in the chip. A '0'
 		indicates that ownership hasn't been taken.
@@ -86,20 +86,20 @@ Description:	The "owned" property produces a '1' if the TPM_TakeOwnership
 What:		/sys/class/tpm/tpmX/device/pcrs
 Date:		April 2005
 KernelVersion:	2.6.12
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "pcrs" property will dump the current value of all Platform
 		Configuration Registers in the TPM. Note that since these
 		values may be constantly changing, the output is only valid
 		for a snapshot in time.

-		Example output::
+		Example output:

-		  PCR-00: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
-		  PCR-01: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
-		  PCR-02: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
-		  PCR-03: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
-		  PCR-04: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
-		  ...
+		PCR-00: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
+		PCR-01: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
+		PCR-02: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
+		PCR-03: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
+		PCR-04: 3A 3F 78 0F 11 A4 B4 99 69 FC AA 80 CD 6E 39 57 C3 3B 22 75
+		...

 		The number of PCRs and hex bytes needed to represent a PCR
 		value will vary depending on TPM chip version. For TPM 1.1 and
@@ -109,7 +109,7 @@ Description:	The "pcrs" property will dump the current value of all Platform
 What:		/sys/class/tpm/tpmX/device/pubek
 Date:		April 2005
 KernelVersion:	2.6.12
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "pubek" property will return the TPM's public endorsement
 		key if possible. If the TPM has had ownership established and
 		is version 1.2, the pubek will not be available without the
@@ -119,49 +119,49 @@ Description:	The "pubek" property will return the TPM's public endorsement
 		ated at TPM manufacture time and exists for the life of the
 		chip.

-		Example output::
+		Example output:

-		  Algorithm: 00 00 00 01
-		  Encscheme: 00 03
-		  Sigscheme: 00 01
-		  Parameters: 00 00 08 00 00 00 00 02 00 00 00 00
-		  Modulus length: 256
-		  Modulus:
-		  B4 76 41 82 C9 20 2C 10 18 40 BC 8B E5 44 4C 6C
-		  3A B2 92 0C A4 9B 2A 83 EB 5C 12 85 04 48 A0 B6
-		  1E E4 81 84 CE B2 F2 45 1C F0 85 99 61 02 4D EB
-		  86 C4 F7 F3 29 60 52 93 6B B2 E5 AB 8B A9 09 E3
-		  D7 0E 7D CA 41 BF 43 07 65 86 3C 8C 13 7A D0 8B
-		  82 5E 96 0B F8 1F 5F 34 06 DA A2 52 C1 A9 D5 26
-		  0F F4 04 4B D9 3F 2D F2 AC 2F 74 64 1F 8B CD 3E
-		  1E 30 38 6C 70 63 69 AB E2 50 DF 49 05 2E E1 8D
-		  6F 78 44 DA 57 43 69 EE 76 6C 38 8A E9 8E A3 F0
-		  A7 1F 3C A8 D0 12 15 3E CA 0E BD FA 24 CD 33 C6
-		  47 AE A4 18 83 8E 22 39 75 93 86 E6 FD 66 48 B6
-		  10 AD 94 14 65 F9 6A 17 78 BD 16 53 84 30 BF 70
-		  E0 DC 65 FD 3C C6 B0 1E BF B9 C1 B5 6C EF B1 3A
-		  F8 28 05 83 62 26 11 DC B4 6B 5A 97 FF 32 26 B6
-		  F7 02 71 CF 15 AE 16 DD D1 C1 8E A8 CF 9B 50 7B
-		  C3 91 FF 44 1E CF 7C 39 FE 17 77 21 20 BD CE 9B
+		Algorithm: 00 00 00 01
+		Encscheme: 00 03
+		Sigscheme: 00 01
+		Parameters: 00 00 08 00 00 00 00 02 00 00 00 00
+		Modulus length: 256
+		Modulus:
+		B4 76 41 82 C9 20 2C 10 18 40 BC 8B E5 44 4C 6C
+		3A B2 92 0C A4 9B 2A 83 EB 5C 12 85 04 48 A0 B6
+		1E E4 81 84 CE B2 F2 45 1C F0 85 99 61 02 4D EB
+		86 C4 F7 F3 29 60 52 93 6B B2 E5 AB 8B A9 09 E3
+		D7 0E 7D CA 41 BF 43 07 65 86 3C 8C 13 7A D0 8B
+		82 5E 96 0B F8 1F 5F 34 06 DA A2 52 C1 A9 D5 26
+		0F F4 04 4B D9 3F 2D F2 AC 2F 74 64 1F 8B CD 3E
+		1E 30 38 6C 70 63 69 AB E2 50 DF 49 05 2E E1 8D
+		6F 78 44 DA 57 43 69 EE 76 6C 38 8A E9 8E A3 F0
+		A7 1F 3C A8 D0 12 15 3E CA 0E BD FA 24 CD 33 C6
+		47 AE A4 18 83 8E 22 39 75 93 86 E6 FD 66 48 B6
+		10 AD 94 14 65 F9 6A 17 78 BD 16 53 84 30 BF 70
+		E0 DC 65 FD 3C C6 B0 1E BF B9 C1 B5 6C EF B1 3A
+		F8 28 05 83 62 26 11 DC B4 6B 5A 97 FF 32 26 B6
+		F7 02 71 CF 15 AE 16 DD D1 C1 8E A8 CF 9B 50 7B
+		C3 91 FF 44 1E CF 7C 39 FE 17 77 21 20 BD CE 9B

-		Possible values::
+		Possible values:

-		  Algorithm:	TPM_ALG_RSA			(1)
-		  Encscheme:	TPM_ES_RSAESPKCSv15		(2)
+		Algorithm:	TPM_ALG_RSA			(1)
+		Encscheme:	TPM_ES_RSAESPKCSv15		(2)
 				TPM_ES_RSAESOAEP_SHA1_MGF1	(3)
-		  Sigscheme:	TPM_SS_NONE			(1)
-		  Parameters, a byte string of 3 u32 values:
+		Sigscheme:	TPM_SS_NONE			(1)
+		Parameters, a byte string of 3 u32 values:
 			Key Length (bits):	00 00 08 00	(2048)
 			Num primes:		00 00 00 02	(2)
 			Exponent Size:		00 00 00 00	(0 means the
 								 default exp)
-		  Modulus Length: 256 (bytes)
-		  Modulus:	The 256 byte Endorsement Key modulus
+		Modulus Length: 256 (bytes)
+		Modulus:	The 256 byte Endorsement Key modulus

 What:		/sys/class/tpm/tpmX/device/temp_deactivated
 Date:		April 2006
 KernelVersion:	2.6.17
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "temp_deactivated" property returns a '1' if the chip has
 		been temporarily deactivated, usually until the next power
 		cycle. Whether a warm boot (reboot) will clear a TPM chip
@@ -170,27 +170,16 @@ Description:	The "temp_deactivated" property returns a '1' if the chip has
 What:		/sys/class/tpm/tpmX/device/timeouts
 Date:		March 2011
 KernelVersion:	3.1
-Contact:	linux-integrity@vger.kernel.org
+Contact:	tpmdd-devel@lists.sf.net
 Description:	The "timeouts" property shows the 4 vendor-specific values
 		for the TPM's interface spec timeouts. The use of these
 		timeouts is defined by the TPM interface spec that the chip
 		conforms to.

-		Example output::
+		Example output:

-		  750000 750000 750000 750000 [original]
+		750000 750000 750000 750000 [original]

 		The four timeout values are shown in usecs, with a trailing
 		"[original]" or "[adjusted]" depending on whether the values
 		were scaled by the driver to be reported in usec from msecs.
-
-What:		/sys/class/tpm/tpmX/tpm_version_major
-Date:		October 2019
-KernelVersion:	5.5
-Contact:	linux-integrity@vger.kernel.org
-Description:	The "tpm_version_major" property shows the TCG spec major version
-		implemented by the TPM device.
-
-		Example output::
-
-		  2
--- a/Documentation/ABI/stable/sysfs-devices
+++ b/Documentation/ABI/stable/sysfs-devices
@@ -1,6 +1,5 @@
-Note:
-  This documents additional properties of any device beyond what
-  is documented in Documentation/admin-guide/sysfs-rules.rst
+# Note: This documents additional properties of any device beyond what
+# is documented in Documentation/admin-guide/sysfs-rules.rst

 What:		/sys/devices/*/of_node
 Date:		February 2015
--- a/Documentation/ABI/stable/sysfs-devices-node
+++ b/Documentation/ABI/stable/sysfs-devices-node
@@ -54,7 +54,7 @@ Date:		October 2002
 Contact:	Linux Memory Management list <linux-mm@kvack.org>
 Description:
 		Provides information about the node's distribution and memory
-		utilization. Similar to /proc/meminfo, see Documentation/filesystems/proc.rst
+		utilization. Similar to /proc/meminfo, see Documentation/filesystems/proc.txt

 What:		/sys/devices/system/node/nodeX/numastat
 Date:		October 2002
--- a/Documentation/ABI/stable/sysfs-driver-aspeed-vuart
+++ b/Documentation/ABI/stable/sysfs-driver-aspeed-vuart
@@ -6,19 +6,10 @@ Description:	Configures which IO port the host side of the UART
 Users:		OpenBMC.  Proposed changes should be mailed to
 		openbmc@lists.ozlabs.org

-What:		/sys/bus/platform/drivers/aspeed-vuart/*/sirq
+What:		/sys/bus/platform/drivers/aspeed-vuart*/sirq
 Date:		April 2017
 Contact:	Jeremy Kerr <jk@ozlabs.org>
 Description:	Configures which interrupt number the host side of
 		the UART will appear on the host <-> BMC LPC bus.
 Users:		OpenBMC.  Proposed changes should be mailed to
 		openbmc@lists.ozlabs.org
-
-What:		/sys/bus/platform/drivers/aspeed-vuart/*/sirq_polarity
-Date:		July 2019
-Contact:	Oskar Senft <osk@google.com>
-Description:	Configures the polarity of the serial interrupt to the
-		host via the BMC LPC bus.
-		Set to 0 for active-low or 1 for active-high.
-Users:		OpenBMC.  Proposed changes should be mailed to
-		openbmc@lists.ozlabs.org
--- a/Documentation/ABI/stable/sysfs-driver-dma-idxd
+++ b/Documentation/ABI/stable/sysfs-driver-dma-idxd
@@ -1,197 +0,0 @@
-What:		/sys/bus/dsa/devices/dsa<m>/version
-Date:		Apr 15, 2020
-KernelVersion:	5.8.0
-Contact:	dmaengine@vger.kernel.org
-Description:	The hardware version number.
-
-What:           /sys/bus/dsa/devices/dsa<m>/cdev_major
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:	The major number that the character device driver assigned to
-		this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/errors
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The error information for this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/max_batch_size
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The largest number of work descriptors in a batch.
-
-What:           /sys/bus/dsa/devices/dsa<m>/max_work_queues_size
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The maximum work queue size supported by this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/max_engines
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The maximum number of engines supported by this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/max_groups
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The maximum number of groups can be created under this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/max_tokens
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The total number of bandwidth tokens supported by this device.
-		The bandwidth tokens represent resources within the DSA
-		implementation, and these resources are allocated by engines to
-		support operations.
-
-What:           /sys/bus/dsa/devices/dsa<m>/max_transfer_size
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The number of bytes to be read from the source address to
-		perform the operation. The maximum transfer size is dependent on
-		the workqueue the descriptor was submitted to.
-
-What:           /sys/bus/dsa/devices/dsa<m>/max_work_queues
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The maximum work queue number that this device supports.
-
-What:           /sys/bus/dsa/devices/dsa<m>/numa_node
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The numa node number for this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/op_cap
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The operation capability bit mask specify the operation types
-		supported by the this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/state
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The state information of this device. It can be either enabled
-		or disabled.
-
-What:           /sys/bus/dsa/devices/dsa<m>/group<m>.<n>
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The assigned group under this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/engine<m>.<n>
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The assigned engine under this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/wq<m>.<n>
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The assigned work queue under this device.
-
-What:           /sys/bus/dsa/devices/dsa<m>/configurable
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    To indicate if this device is configurable or not.
-
-What:           /sys/bus/dsa/devices/dsa<m>/token_limit
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The maximum number of bandwidth tokens that may be in use at
-		one time by operations that access low bandwidth memory in the
-		device.
-
-What:		/sys/bus/dsa/devices/dsa<m>/cmd_status
-Date:		Aug 28, 2020
-KernelVersion:	5.10.0
-Contact:	dmaengine@vger.kernel.org
-Description:	The last executed device administrative command's status/error.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/group_id
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The group id that this work queue belongs to.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/size
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The work queue size for this work queue.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/type
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The type of this work queue, it can be "kernel" type for work
-		queue usages in the kernel space or "user" type for work queue
-		usages by applications in user space.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/cdev_minor
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The minor number assigned to this work queue by the character
-		device driver.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/mode
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The work queue mode type for this work queue.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/priority
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The priority value of this work queue, it is a vlue relative to
-		other work queue in the same group to control quality of service
-		for dispatching work from multiple workqueues in the same group.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/state
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The current state of the work queue.
-
-What:           /sys/bus/dsa/devices/wq<m>.<n>/threshold
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The number of entries in this work queue that may be filled
-		via a limited portal.
-
-What:		/sys/bus/dsa/devices/wq<m>.<n>/max_transfer_size
-Date:		Aug 28, 2020
-KernelVersion:	5.10.0
-Contact:	dmaengine@vger.kernel.org
-Description:	The max transfer sized for this workqueue. Cannot exceed device
-		max transfer size. Configurable parameter.
-
-What:		/sys/bus/dsa/devices/wq<m>.<n>/max_batch_size
-Date:		Aug 28, 2020
-KernelVersion:	5.10.0
-Contact:	dmaengine@vger.kernel.org
-Description:	The max batch size for this workqueue. Cannot exceed device
-		max batch size. Configurable parameter.
-
-What:           /sys/bus/dsa/devices/engine<m>.<n>/group_id
-Date:           Oct 25, 2019
-KernelVersion:  5.6.0
-Contact:        dmaengine@vger.kernel.org
-Description:    The group that this engine belongs to.
--- a/Documentation/ABI/stable/sysfs-driver-dma-ioatdma
+++ b/Documentation/ABI/stable/sysfs-driver-dma-ioatdma
@@ -1,29 +1,29 @@
-What:           /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
+What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
 Date:           December 3, 2009
 KernelVersion:  2.6.32
 Contact:        dmaengine@vger.kernel.org
 Description:	Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL,
 		DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT.

-What:           /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
+What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
 Date:           December 3, 2009
 KernelVersion:  2.6.32
 Contact:        dmaengine@vger.kernel.org
 Description:	The number of descriptors active in the ring.

-What:           /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
+What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
 Date:           December 3, 2009
 KernelVersion:  2.6.32
 Contact:        dmaengine@vger.kernel.org
 Description:	Descriptor ring size, total number of descriptors available.

-What:           /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
+What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
 Date:           December 3, 2009
 KernelVersion:  2.6.32
 Contact:        dmaengine@vger.kernel.org
 Description:	Version of ioatdma device.

-What:           /sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
+What:           sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
 Date:           August 8, 2017
 KernelVersion:  4.14
 Contact:        dmaengine@vger.kernel.org
--- a/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
+++ b/Documentation/ABI/stable/sysfs-driver-firmware-zynqmp
@@ -1,115 +0,0 @@
-What:		/sys/devices/platform/firmware\:zynqmp-firmware/ggs*
-Date:		March 2020
-KernelVersion:	5.6
-Contact:	"Jolly Shah" <jollys@xilinx.com>
-Description:
-		Read/Write PMU global general storage register value,
-		GLOBAL_GEN_STORAGE{0:3}.
-		Global general storage register that can be used
-		by system to pass information between masters.
-
-		The register is reset during system or power-on
-		resets. Three registers are used by the FSBL and
-		other Xilinx software products: GLOBAL_GEN_STORAGE{4:6}.
-
-		Usage::
-
-		    # cat /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
-		    # echo <value> > /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
-
-		Example::
-
-		    # cat /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
-		    # echo 0x1234ABCD > /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
-
-Users:		Xilinx
-
-What:		/sys/devices/platform/firmware\:zynqmp-firmware/pggs*
-Date:		March 2020
-KernelVersion:	5.6
-Contact:	"Jolly Shah" <jollys@xilinx.com>
-Description:
-		Read/Write PMU persistent global general storage register
-		value, PERS_GLOB_GEN_STORAGE{0:3}.
-		Persistent global general storage register that
-		can be used by system to pass information between
-		masters.
-
-		This register is only reset by the power-on reset
-		and maintains its value through a system reset.
-		Four registers are used by the FSBL and other Xilinx
-		software products: PERS_GLOB_GEN_STORAGE{4:7}.
-		Register is reset only by a POR reset.
-
-		Usage::
-
-		    # cat /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
-		    # echo <value> > /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
-
-		Example::
-
-		    # cat /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
-		    # echo 0x1234ABCD > /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
-
-Users:		Xilinx
-
-What:		/sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
-Date:		March 2020
-KernelVersion:	5.6
-Contact:	"Jolly Shah" <jollys@xilinx.com>
-Description:
-		This sysfs interface allows to set the shutdown scope for the
-		next shutdown request. When the next shutdown is performed, the
-		platform specific portion of PSCI-system_off can use the chosen
-		shutdown scope.
-
-		Following are available shutdown scopes(subtypes):
-
-		subsystem:
-				Only the APU along with all of its peripherals
-				not used by other processing units will be
-				shut down. This may result in the FPD power
-				domain being shut down provided that no other
-				processing unit uses FPD peripherals or DRAM.
-		ps_only:
-				The complete PS will be shut down, including the
-				RPU, PMU, etc.  Only the PL domain (FPGA)
-				remains untouched.
-		system:
-				The complete system/device is shut down.
-
-		Usage::
-
-		    # cat /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
-		    # echo <scope> > /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
-
-		Example::
-
-		    # cat /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
-		    # echo "subsystem" > /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
-
-Users:		Xilinx
-
-What:		/sys/devices/platform/firmware\:zynqmp-firmware/health_status
-Date:		March 2020
-KernelVersion:	5.6
-Contact:	"Jolly Shah" <jollys@xilinx.com>
-Description:
-		This sysfs interface allows to set the health status. If PMUFW
-		is compiled with CHECK_HEALTHY_BOOT, it will check the healthy
-		bit on FPD WDT expiration. If healthy bit is set by a user
-		application running in Linux, PMUFW will do APU only restart. If
-		healthy bit is not set during FPD WDT expiration, PMUFW will do
-		system restart.
-
-		Usage:
-
-		Set healthy bit::
-
-		    # echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/health_status
-
-		Unset healthy bit::
-
-		    # echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/health_status
-
-Users:		Xilinx
--- a/Documentation/ABI/stable/sysfs-driver-ib_srp
+++ b/Documentation/ABI/stable/sysfs-driver-ib_srp
@@ -6,7 +6,6 @@ Description:	Interface for making ib_srp connect to a new target.
 		One can request ib_srp to connect to a new target by writing
 		a comma-separated list of login parameters to this sysfs
 		attribute. The supported parameters are:
-
 		* id_ext, a 16-digit hexadecimal number specifying the eight
 		  byte identifier extension in the 16-byte SRP target port
 		  identifier. The target port identifier is sent by ib_srp
@@ -68,8 +67,6 @@ Description:	Interface for making ib_srp connect to a new target.
 		  initiator is allowed to queue per SCSI host. The default
 		  value for this parameter is 62. The lowest supported value
 		  is 2.
-		* max_it_iu_size, a decimal number specifying the maximum
-		  initiator to target information unit length.

 What:		/sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev
 Date:		January 2, 2006
--- a/Documentation/ABI/stable/sysfs-driver-mlxreg-io
+++ b/Documentation/ABI/stable/sysfs-driver-mlxreg-io
@@ -1,4 +1,5 @@
 What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_health
+
 Date:		June 2018
 KernelVersion:	4.19
 Contact:	Vadim Pasternak <vadimpmellanox.com>
@@ -18,6 +19,7 @@ Description:	These files show with which CPLD versions have been burned
 		The files are read only.

 What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/fan_dir
+
 Date:		December 2018
 KernelVersion:	5.0
 Contact:	Vadim Pasternak <vadimpmellanox.com>
@@ -27,16 +29,18 @@ Description:	This file shows the system fans direction:

 		The files are read only.

-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version
+What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable
+
 Date:		November 2018
 KernelVersion:	5.0
 Contact:	Vadim Pasternak <vadimpmellanox.com>
 Description:	These files show with which CPLD versions have been burned
-		on LED or Gearbox board.
+		on LED board.

 		The files are read only.

 What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable
+
 Date:		November 2018
 KernelVersion:	5.0
 Contact:	Vadim Pasternak <vadimpmellanox.com>
@@ -104,6 +108,7 @@ What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_comex_pwr_fail
 What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_from_comex
 What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_system
 What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_voltmon_upgrade_fail
+
 Date:		November 2018
 KernelVersion:	5.0
 Contact:	Vadim Pasternak <vadimpmellanox.com>
@@ -116,21 +121,6 @@ Description:	These files show the system reset cause, as following: ComEx

 		The files are read only.

-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version
-Date:		November 2018
-KernelVersion:	5.0
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	These files show with which CPLD versions have been burned
-		on LED board.
-
-		The files are read only.
-
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_comex_thermal
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_comex_wd
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_from_asic
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_reload_bios
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sff_wd
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_swb_wd
 Date:		June 2019
 KernelVersion:	5.3
 Contact:	Vadim Pasternak <vadimpmellanox.com>
@@ -144,82 +134,9 @@ Description:	These files show the system reset cause, as following:

 		The files are read only.

-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config1
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config2
-Date:		January 2020
-KernelVersion:	5.6
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	These files show system static topology identification
-		like system's static I2C topology, number and type of FPGA
-		devices within the system and so on.
-
-		The files are read only.
-
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_ac_pwr_fail
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_platform
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_soc
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sw_pwr_off
-Date:		January 2020
-KernelVersion:	5.6
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	These files show the system reset causes, as following: reset
-		due to AC power failure, reset invoked from software by
-		assertion reset signal through CPLD. reset caused by signal
-		asserted by SOC through ACPI register, reset invoked from
-		software by assertion power off signal through CPLD.
-
-		The files are read only.
-
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pcie_asic_reset_dis
-Date:		January 2020
-KernelVersion:	5.6
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	This file allows to retain ASIC up during PCIe root complex
-		reset, when attribute is set 1.
-
-		The file is read/write.
-
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/vpd_wp
-Date:		January 2020
-KernelVersion:	5.6
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	This file allows to overwrite system VPD hardware wrtie
-		protection when attribute is set 1.
-
-		The file is read/write.
-
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/voltreg_update_status
-Date:		January 2020
-KernelVersion:	5.6
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	This file exposes the configuration update status of burnable
-		voltage regulator devices. The status values are as following:
-		0 - OK; 1 - CRC failure; 2 = I2C failure; 3 - in progress.
-
-		The file is read only.
-
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ufm_version
-Date:		January 2020
-KernelVersion:	5.6
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	This file exposes the firmware version of burnable voltage
-		regulator devices.
-
-		The file is read only.
-
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld1_pn
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld2_pn
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_pn
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_pn
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld1_version_min
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld2_version_min
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version_min
-What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version_min
-Date:		July 2020
-KernelVersion:	5.9
-Contact:	Vadim Pasternak <vadimpmellanox.com>
-Description:	These files show with which CPLD part numbers and minor
-		versions have been burned CPLD devices equipped on a
-		system.
-
-		The files are read only.
+What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_comex_thermal
+What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_comex_wd
+What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_from_asic
+What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_reload_bios
+What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sff_wd
+What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_swb_wd
--- a/Documentation/ABI/stable/sysfs-driver-speakup
+++ b/Documentation/ABI/stable/sysfs-driver-speakup
@@ -1,379 +0,0 @@
-What:		/sys/accessibility/speakup/attrib_bleep
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Beeps the PC speaker when there is an attribute change such as
-		foreground or background color when using speakup review
-		commands. One = on, zero = off.
-
-What:		/sys/accessibility/speakup/bell_pos
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This works much like a typewriter bell. If for example 72 is
-		echoed to bell_pos, it will beep the PC speaker when typing on
-		a line past character 72.
-
-What:		/sys/accessibility/speakup/bleeps
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This controls whether one hears beeps through the PC speaker
-		when using speakup's review commands.
-		TODO: what values does it accept?
-
-What:		/sys/accessibility/speakup/bleep_time
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This controls the duration of the PC speaker beeps speakup
-		produces.
-		TODO: What are the units? Jiffies?
-
-What:		/sys/accessibility/speakup/cursor_time
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This controls cursor delay when using arrow keys. When a
-		connection is very slow, with the default setting, when moving
-		with  the arrows, or backspacing etc. speakup says the incorrect
-		characters. Set this to a higher value to adjust for the delay
-		and better synchronisation between cursor position and speech.
-
-What:		/sys/accessibility/speakup/delimiters
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Delimit a word from speakup.
-		TODO: add more info
-
-What:		/sys/accessibility/speakup/ex_num
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	TODO:
-
-What:		/sys/accessibility/speakup/key_echo
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Controls if speakup speaks keys when they are typed. One = on,
-		zero = off or don't echo keys.
-
-What:		/sys/accessibility/speakup/keymap
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Speakup keymap remaps keys to Speakup functions.
-		It uses a binary
-		format. A special program called genmap is needed to compile a
-		textual  keymap into the binary format which is then loaded into
-		/sys/accessibility/speakup/keymap.
-
-What:		/sys/accessibility/speakup/no_interrupt
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Controls if typing interrupts output from speakup. With
-		no_interrupt set to zero, typing on the keyboard will interrupt
-		speakup if for example
-		the say screen command is used before the
-		entire screen  is read.
-
-		With no_interrupt set to one, if the say
-		screen command is used, and one then types on the keyboard,
-		speakup will continue to say the whole screen regardless until
-		it finishes.
-
-What:		/sys/accessibility/speakup/punc_all
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This is a list of all the punctuation speakup should speak when
-		punc_level is set to four.
-
-What:		/sys/accessibility/speakup/punc_level
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Controls the level of punctuation spoken as the screen is
-		displayed, not reviewed. Levels range from zero no punctuation,
-		to four, all punctuation. One corresponds to punc_some, two
-		corresponds to punc_most, and three as well as four both
-		correspond to punc_all. Some hardware synthesizers may have
-		different levels each corresponding to  three and four for
-		punc_level. Also note that if punc_level is set to zero, and
-		key_echo is set to one, typed punctuation is still spoken as it
-		is typed.
-
-What:		/sys/accessibility/speakup/punc_most
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This is a list of all the punctuation speakup should speak when
-		punc_level is set to two.
-
-What:		/sys/accessibility/speakup/punc_some
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This is a list of all the punctuation speakup should speak when
-		punc_level is set to one.
-
-What:		/sys/accessibility/speakup/reading_punc
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Almost the same as punc_level, the differences being that
-		reading_punc controls the level of punctuation when reviewing
-		the screen with speakup's screen review commands. The other
-		difference is that reading_punc set to three speaks punc_all,
-		and reading_punc set to four speaks all punctuation, including
-		spaces.
-
-What:		/sys/accessibility/speakup/repeats
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	A list of characters speakup repeats. Normally, when there are
-		more than three characters in a row, speakup
-		just reads three of
-		those characters. For example, "......" would be read as dot,
-		dot, dot. If a . is added to the list of characters in repeats,
-		"......" would be read as dot, dot, dot, times six.
-
-What:		/sys/accessibility/speakup/say_control
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	If set to one, speakup speaks shift, alt and control when those
-		keys are pressed. If say_control is set to zero, shift, ctrl,
-		and alt are not spoken when they are pressed.
-
-What:		/sys/accessibility/speakup/say_word_ctl
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	TODO:
-
-What:		/sys/accessibility/speakup/silent
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	TODO:
-
-What:		/sys/accessibility/speakup/spell_delay
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This controls how fast a word is spelled
-		when speakup's say word
-		review command is pressed twice quickly to speak the current
-		word being reviewed. Zero just speaks the letters one after
-		another, while values one through four
-		seem to introduce more of
-		a pause between the spelling of each letter by speakup.
-
-What:		/sys/accessibility/speakup/synth
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the synthesizer driver currently in use. Reading
-		synth returns the synthesizer driver currently in use. Writing
-		synth switches to the given synthesizer driver, provided it is
-		either built into the kernel, or already loaded as a module.
-
-What:		/sys/accessibility/speakup/synth_direct
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Sends whatever is written to synth_direct
-		directly to the speech synthesizer in use, bypassing speakup.
-		This could be used to make the synthesizer speak
-		a string, or to
-		send control sequences to the synthesizer to change how the
-		synthesizer behaves.
-
-What:		/sys/accessibility/speakup/version
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Reading version returns the version of speakup, and the version
-		of the synthesizer driver currently in use.
-
-What:		/sys/accessibility/speakup/i18n/announcements
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This file contains various general announcements, most of which
-		cannot be categorized.  You will find messages such as "You
-		killed Speakup", "I'm alive", "leaving help", "parked",
-		"unparked", and others. You will also find the names of the
-		screen edges and cursor tracking modes here.
-
-What:		/sys/accessibility/speakup/i18n/chartab
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	TODO
-
-What:		/sys/accessibility/speakup/i18n/ctl_keys
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Here, you will find names of control keys.  These are used with
-		Speakup's say_control feature.
-
-What:		/sys/accessibility/speakup/i18n/function_names
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Here, you will find a list of names for Speakup functions.
-		These are used by the help system.  For example, suppose that
-		you have activated help mode, and you pressed
-		keypad 3.  Speakup
-		says: "keypad 3 is character, say next."
-		The message "character, say next" names a Speakup function, and
-		it comes from this function_names file.
-
-What:		/sys/accessibility/speakup/i18n/states
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This file contains names for key states.
-		Again, these are part of the help system.  For instance, if you
-		had pressed speakup + keypad 3, you would hear:
-		"speakup keypad 3 is go to bottom edge."
-
-		The speakup key is depressed, so the name of the key state is
-		speakup.
-
-		This part of the message comes from the states collection.
-
-What:		/sys/accessibility/speakup/i18n/characters
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Through this sys entry, Speakup gives you the ability to change
-		how Speakup pronounces a given character. You could, for
-		example, change how some punctuation characters are spoken. You
-		can even change how Speakup will pronounce certain letters. For
-		further details see '12.  Changing the Pronunciation of
-		Characters' in Speakup User's Guide (file spkguide.txt in
-		source).
-
-What:		/sys/accessibility/speakup/i18n/colors
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	When you use the "say attributes" function, Speakup says the
-		name of the foreground and background colors.  These names come
-		from the i18n/colors file.
-
-What:		/sys/accessibility/speakup/i18n/formatted
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This group of messages contains embedded formatting codes, to
-		specify the type and width of displayed data.  If you change
-		these, you must preserve all of the formatting codes, and they
-		must appear in the order used by the default messages.
-
-What:		/sys/accessibility/speakup/i18n/key_names
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Again, key_names is used by Speakup's help system.  In the
-		previous example, Speakup said that you pressed "keypad 3."
-		This name came from the key_names file.
-
-What:		/sys/accessibility/speakup/<synth-name>/
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	In `/sys/accessibility/speakup` is a directory corresponding to
-		the synthesizer driver currently in use (E.G) `soft` for the
-		soft driver. This directory contains files which control the
-		speech synthesizer itself,
-		as opposed to controlling the speakup
-		screen reader. The parameters in this directory have the same
-		names and functions across all
-		supported synthesizers. The range
-		of values for freq, pitch, rate, and vol is the same for all
-		supported synthesizers, with the given range being internally
-		mapped by the driver to  more or less fit the range of values
-		supported for a given parameter by the individual synthesizer.
-		Below is a description of values and  parameters for soft
-		synthesizer, which is currently the most commonly used.
-
-What:		/sys/accessibility/speakup/soft/caps_start
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This is the string that is sent to the synthesizer to cause it
-		to start speaking uppercase letters. For the soft synthesizer
-		and most others, this causes the pitch of the voice to rise
-		above the currently set pitch.
-
-What:		/sys/accessibility/speakup/soft/caps_stop
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This is the string sent to the synthesizer to cause it to stop
-		speaking uppercase letters. In the case of the soft synthesizer
-		and most others, this returns the pitch of the voice
-		down to the
-		currently set pitch.
-
-What:		/sys/accessibility/speakup/soft/delay_time
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	TODO:
-
-What:		/sys/accessibility/speakup/soft/direct
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Controls if punctuation is spoken by speakup, or by the
-		synthesizer.
-
-		For example, speakup speaks ">" as "greater", while
-		the espeak synthesizer used by the soft driver speaks "greater
-		than". Zero lets speakup speak the punctuation. One lets the
-		synthesizer itself speak punctuation.
-
-What:		/sys/accessibility/speakup/soft/freq
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the frequency of the speech synthesizer. Range is
-		0-9.
-
-What:		/sys/accessibility/speakup/soft/full_time
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	TODO:
-
-What:		/sys/accessibility/speakup/soft/jiffy_delta
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	This controls how many jiffys the kernel gives to the
-		synthesizer. Setting this too high can make a system unstable,
-		or even crash it.
-
-What:		/sys/accessibility/speakup/soft/pitch
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the pitch of the synthesizer. The range is 0-9.
-
-What:		/sys/accessibility/speakup/soft/inflection
-KernelVersion:	5.8
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the inflection of the synthesizer, i.e. the pitch
-		range. The range is 0-9.
-
-What:		/sys/accessibility/speakup/soft/punct
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the amount of punctuation spoken by the
-		synthesizer. The range for the soft driver seems to be 0-2.
-		TODO: How is this related to speakup's punc_level, or
-		reading_punc.
-
-What:		/sys/accessibility/speakup/soft/rate
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the rate of the synthesizer. Range is from zero
-		slowest, to nine fastest.
-
-What:		/sys/accessibility/speakup/soft/tone
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the tone of the speech synthesizer. The range for
-		the soft driver seems to be 0-2. This seems to make no
-		difference if using espeak and the espeakup connector.
-		TODO: does espeakup support different tonalities?
-
-What:		/sys/accessibility/speakup/soft/trigger_time
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	TODO:
-
-What:		/sys/accessibility/speakup/soft/voice
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the voice used by the synthesizer if the
-		synthesizer can speak in more than one voice. The range for the
-		soft driver is 0-7. Note that while espeak supports multiple
-		voices, this parameter will not set the voice when the espeakup
-		connector is used  between speakup and espeak.
-
-What:		/sys/accessibility/speakup/soft/vol
-KernelVersion:	2.6
-Contact:	speakup@linux-speakup.org
-Description:	Gets or sets the volume of the speech synthesizer. Range is 0-9,
-		with zero being the softest, and nine being the loudest.
-
--- a/Documentation/ABI/stable/sysfs-driver-w1_ds28e04
+++ b/Documentation/ABI/stable/sysfs-driver-w1_ds28e04
@@ -2,7 +2,7 @@ What:		/sys/bus/w1/devices/.../pio
 Date:		May 2012
 Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>
 Description:	read/write the contents of the two PIO's of the DS28E04-100
-		see Documentation/w1/slaves/w1_ds28e04.rst for detailed information
+		see Documentation/w1/slaves/w1_ds28e04 for detailed information
 Users:		any user space application which wants to communicate with DS28E04-100


@@ -11,5 +11,5 @@ What:		/sys/bus/w1/devices/.../eeprom
 Date:		May 2012
 Contact:	Markus Franke <franm@hrz.tu-chemnitz.de>
 Description:	read/write the contents of the EEPROM memory of the DS28E04-100
-		see Documentation/w1/slaves/w1_ds28e04.rst for detailed information
+		see Documentation/w1/slaves/w1_ds28e04 for detailed information
 Users:		any user space application which wants to communicate with DS28E04-100
--- a/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
+++ b/Documentation/ABI/stable/sysfs-driver-w1_ds28ea00
@@ -2,5 +2,5 @@ What:		/sys/bus/w1/devices/.../w1_seq
 Date:		Apr 2015
 Contact:	Matt Campbell <mattrcampbell@gmail.com>
 Description:	Support for the DS28EA00 chain sequence function
-		see Documentation/w1/slaves/w1_therm.rst for detailed information
+		see Documentation/w1/slaves/w1_therm for detailed information
 Users:		any user space application which wants to communicate with DS28EA00
--- a/Documentation/ABI/stable/sysfs-firmware-efi-vars
+++ b/Documentation/ABI/stable/sysfs-firmware-efi-vars
@@ -17,7 +17,6 @@ Description:
 		directory has a name of the form "<key>-<vendor guid>"
 		and contains the following files:

-		=============== ========================================
 		attributes:	A read-only text file enumerating the
 				EFI variable flags.  Potential values
 				include:
@@ -60,14 +59,12 @@ Description:

 		size:		As ASCII representation of the size of
 				the variable's value.
-		=============== ========================================


 		In addition, two other magic binary files are provided
 		in the top-level directory and are used for adding and
 		removing variables:

-		=============== ========================================
 		new_var:	Takes a "struct efi_variable" and
 				instructs the EFI firmware to create a
 				new variable.
@@ -76,4 +73,3 @@ Description:
 				instructs the EFI firmware to remove any
 				variable that has a matching vendor GUID
 				and variable key name.
-		=============== ========================================
--- a/Documentation/ABI/stable/sysfs-firmware-opal-dump
+++ b/Documentation/ABI/stable/sysfs-firmware-opal-dump
@@ -7,7 +7,6 @@ Description:

 		This is only for the powerpc/powernv platform.

-		=============== ===============================================
 		initiate_dump:	When '1' is written to it,
 				we will initiate a dump.
 				Read this file for supported commands.
@@ -20,11 +19,8 @@ Description:
 				and ID of the dump, use the id and type files.
 				Do not rely on any particular size of dump
 				type or dump id.
-		=============== ===============================================

 		Each dump has the following files:
-
-		=============== ===============================================
 		id:		An ASCII representation of the dump ID
 				in hex (e.g. '0x01')
 		type:		An ASCII representation of the type of
@@ -43,4 +39,3 @@ Description:
 				inaccessible.
 				Reading this file will get a list of
 				supported actions.
-		=============== ===============================================
--- a/Documentation/ABI/stable/sysfs-firmware-opal-elog
+++ b/Documentation/ABI/stable/sysfs-firmware-opal-elog
@@ -38,7 +38,6 @@ Description:
 		For each log entry (directory), there are the following
 		files:

-		==============  ================================================
 		id:		An ASCII representation of the ID of the
 				error log, in hex - e.g. "0x01".

@@ -59,4 +58,3 @@ Description:
 				entry will be removed from sysfs.
 				Reading this file will list the supported
 				operations (currently just acknowledge).
-		==============  ================================================
--- a/Documentation/ABI/stable/sysfs-hypervisor-xen
+++ b/Documentation/ABI/stable/sysfs-hypervisor-xen
@@ -33,8 +33,6 @@ Description:	If running under Xen:
 		Space separated list of supported guest system types. Each type
 		is in the format: <class>-<major>.<minor>-<arch>
 		With:
-
-			======== ============================================
 			<class>: "xen" -- x86: paravirtualized, arm: standard
 				 "hvm" -- x86 only: fully virtualized
 			<major>: major guest interface version
@@ -45,7 +43,6 @@ Description:	If running under Xen:
 				 "x86_64": 64 bit x86 guest
 				 "armv7l": 32 bit arm guest
 				 "aarch64": 64 bit arm guest
-			======== ============================================

 What:		/sys/hypervisor/properties/changeset
 Date:		March 2009
--- a/Documentation/ABI/stable/sysfs-kernel-notes
+++ b/Documentation/ABI/stable/sysfs-kernel-notes
@@ -1,5 +0,0 @@
-What:		/sys/kernel/notes
-Date:		July 2009
-Contact:	<linux-kernel@vger.kernel.org>
-Description:	The /sys/kernel/notes file contains the binary representation
-		of the running vmlinux's .notes section.
--- a/Documentation/ABI/stable/vdso
+++ b/Documentation/ABI/stable/vdso
@@ -1,9 +1,3 @@
-What:		vDSO
-Date:		July 2011
-KernelVersion:	3.0
-Contact:	Andy Lutomirski <luto@kernel.org>
-Description:
-
 On some architectures, when the kernel loads any userspace program it
 maps an ELF DSO into that program's address space.  This DSO is called
 the vDSO and it often contains useful and highly-optimized alternatives
@@ -29,7 +23,6 @@ Unless otherwise noted, the set of symbols with any given version and the
 ABI of those symbols is considered stable.  It may vary across architectures,
 though.

-Note:
- As of this writing, this ABI documentation as been confirmed for x86_64.
+(As of this writing, this ABI documentation as been confirmed for x86_64.
 The maintainers of the other vDSO-using architectures should confirm
- that it is correct for their architecture.
+ that it is correct for their architecture.)
--- a/Documentation/ABI/testing/configfs-acpi
+++ b/Documentation/ABI/testing/configfs-acpi
@@ -14,8 +14,7 @@ Description:
 		This group contains the configuration for user defined ACPI
 		tables. The attributes of a user define table are:

-		aml
-			      - a binary attribute that the user can use to
+		aml 		- a binary attribute that the user can use to
 				fill in the ACPI aml definitions. Once the aml
 				data is written to this file and the file is
 				closed the table will be loaded and ACPI devices
@@ -27,26 +26,11 @@ Description:
 		The rest of the attributes are read-only and are valid only
 		after the table has been loaded by filling the aml entry:

-		signature
-				- ASCII table signature
-
-		length
-				- length of table in bytes, including the header
-
-		revision
-				- ACPI Specification minor version number
-
-		oem_id
-				- ASCII OEM identification
-
-		oem_table_id
-				- ASCII OEM table identification
-
-		oem_revision
-				- OEM revision number
-
-		asl_compiler_id
-				- ASCII ASL compiler vendor ID
-
-		asl_compiler_revision
-				- ASL compiler version
+		signature 	- ASCII table signature
+		length 		- length of table in bytes, including the header
+		revision 	- ACPI Specification minor version number
+		oem_id 		- ASCII OEM identification
+		oem_table_id 	- ASCII OEM table identification
+		oem_revision 	- OEM revision number
+		asl_compiler_id - ASCII ASL compiler vendor ID
+		asl_compiler_revision - ASL compiler version
--- a/Documentation/ABI/testing/configfs-most
+++ b/Documentation/ABI/testing/configfs-most
@@ -1,241 +0,0 @@
-What: 		/sys/kernel/config/most_<component>
-Date: 		March 8, 2019
-KernelVersion:  5.2
-Description: 	Interface is used to configure and connect device channels
-		to component drivers.
-
-		Attributes are visible only when configfs is mounted. To mount
-		configfs in /sys/kernel/config directory use:
-		# mount -t configfs none /sys/kernel/config/
-
-
-What: 		/sys/kernel/config/most_cdev/<link>
-Date: 		March 8, 2019
-KernelVersion:  5.2
-Description:
-		The attributes:
-
-		buffer_size
-				configure the buffer size for this channel
-
-		subbuffer_size
-				configure the sub-buffer size for this channel
-				(needed for synchronous and isochrnous data)
-
-
-		num_buffers
-				configure number of buffers used for this
-				channel
-
-		datatype
-				configure type of data that will travel over
-				this channel
-
-		direction
-				configure whether this link will be an input
-				or output
-
-		dbr_size
-				configure DBR data buffer size (this is used
-				for MediaLB communication only)
-
-		packets_per_xact
-				configure the number of packets that will be
-				collected from the network before being
-				transmitted via USB (this is used for USB
-				communication only)
-
-		device
-				name of the device the link is to be attached to
-
-		channel
-				name of the channel the link is to be attached to
-
-		comp_params
-				pass parameters needed by some components
-
-		create_link
-				write '1' to this attribute to trigger the
-				creation of the link. In case of speculative
-				configuration, the creation is post-poned until
-				a physical device is being attached to the bus.
-
-		destroy_link
-				write '1' to this attribute to destroy an
-				active link
-
-What: 		/sys/kernel/config/most_video/<link>
-Date: 		March 8, 2019
-KernelVersion:  5.2
-Description:
-		The attributes:
-
-		buffer_size
-				configure the buffer size for this channel
-
-		subbuffer_size
-				configure the sub-buffer size for this channel
-				(needed for synchronous and isochrnous data)
-
-
-		num_buffers
-				configure number of buffers used for this
-				channel
-
-		datatype
-				configure type of data that will travel over
-				this channel
-
-		direction
-				configure whether this link will be an input
-				or output
-
-		dbr_size
-				configure DBR data buffer size (this is used
-				for MediaLB communication only)
-
-		packets_per_xact
-				configure the number of packets that will be
-				collected from the network before being
-				transmitted via USB (this is used for USB
-				communication only)
-
-		device
-				name of the device the link is to be attached to
-
-		channel
-				name of the channel the link is to be attached to
-
-		comp_params
-				pass parameters needed by some components
-
-		create_link
-				write '1' to this attribute to trigger the
-				creation of the link. In case of speculative
-				configuration, the creation is post-poned until
-				a physical device is being attached to the bus.
-
-		destroy_link
-				write '1' to this attribute to destroy an
-				active link
-
-What: 		/sys/kernel/config/most_net/<link>
-Date: 		March 8, 2019
-KernelVersion:  5.2
-Description:
-		The attributes:
-
-		buffer_size
-				configure the buffer size for this channel
-
-		subbuffer_size
-				configure the sub-buffer size for this channel
-				(needed for synchronous and isochrnous data)
-
-
-		num_buffers
-				configure number of buffers used for this
-				channel
-
-		datatype
-				configure type of data that will travel over
-				this channel
-
-		direction
-				configure whether this link will be an input
-				or output
-
-		dbr_size
-				configure DBR data buffer size (this is used
-				for MediaLB communication only)
-
-		packets_per_xact
-				configure the number of packets that will be
-				collected from the network before being
-				transmitted via USB (this is used for USB
-				communication only)
-
-		device
-				name of the device the link is to be attached to
-
-		channel
-				name of the channel the link is to be attached to
-
-		comp_params
-				pass parameters needed by some components
-
-		create_link
-				write '1' to this attribute to trigger the
-				creation of the link. In case of speculative
-				configuration, the creation is post-poned until
-				a physical device is being attached to the bus.
-
-		destroy_link
-				write '1' to this attribute to destroy an
-				active link
-
-What: 		/sys/kernel/config/most_sound/<card>
-Date: 		March 8, 2019
-KernelVersion:  5.2
-Description:
-		The attributes:
-
-		create_card
-				write '1' to this attribute to trigger the
-                                registration of the sound card with the ALSA
-				subsystem.
-
-What: 		/sys/kernel/config/most_sound/<card>/<link>
-Date: 		March 8, 2019
-KernelVersion:  5.2
-Description:
-		The attributes:
-
-		buffer_size
-				configure the buffer size for this channel
-
-		subbuffer_size
-				configure the sub-buffer size for this channel
-				(needed for synchronous and isochrnous data)
-
-
-		num_buffers
-				configure number of buffers used for this
-				channel
-
-		datatype
-				configure type of data that will travel over
-				this channel
-
-		direction
-				configure whether this link will be an input
-				or output
-
-		dbr_size
-				configure DBR data buffer size (this is used
-				for MediaLB communication only)
-
-		packets_per_xact
-				configure the number of packets that will be
-				collected from the network before being
-				transmitted via USB (this is used for USB
-				communication only)
-
-		device
-				name of the device the link is to be attached to
-
-		channel
-				name of the channel the link is to be attached to
-
-		comp_params
-				pass parameters needed by some components
-
-		create_link
-				write '1' to this attribute to trigger the
-				creation of the link. In case of speculative
-				configuration, the creation is post-poned until
-				a physical device is being attached to the bus.
-
-		destroy_link
-				write '1' to this attribute to destroy an
-				active link
--- a/Documentation/ABI/testing/configfs-spear-pcie-gadget
+++ b/Documentation/ABI/testing/configfs-spear-pcie-gadget
@@ -10,24 +10,22 @@ Description:
 	This interfaces can be used to show spear's PCIe device capability.

 	Nodes are only visible when configfs is mounted. To mount configfs
-	in /config directory use::
+	in /config directory use:
+	# mount -t configfs none /config/

-	  # mount -t configfs none /config/
-
-	For nth PCIe Device Controller /config/pcie-gadget.n/:
-
-	=============== ======================================================
-	link		used to enable ltssm and read its status.
-	int_type	used to configure and read type of supported interrupt
-	no_of_msi	used to configure number of MSI vector needed and
+	For nth PCIe Device Controller
+	/config/pcie-gadget.n/
+		link ... used to enable ltssm and read its status.
+		int_type ...used to configure and read type of supported
+			interrupt
+		no_of_msi ... used to configure number of MSI vector needed and
 			to read no of MSI granted.
-	inta		write 1 to assert INTA and 0 to de-assert.
-	send_msi	write MSI vector to be sent.
-	vendor_id	used to write and read vendor id (hex)
-	device_id	used to write and read device id (hex)
-	bar0_size	used to write and read bar0_size
-	bar0_address	used to write and read bar0 mapped area in hex.
-	bar0_rw_offset	used to write and read offset of bar0 where bar0_data
-			will be written or read.
-	bar0_data	used to write and read data at bar0_rw_offset.
-	=============== ======================================================
+		inta ... write 1 to assert INTA and 0 to de-assert.
+		send_msi ... write MSI vector to be sent.
+		vendor_id ... used to write and read vendor id (hex)
+		device_id ... used to write and read device id (hex)
+		bar0_size ... used to write and read bar0_size
+		bar0_address ... used to write and read bar0 mapped area in hex.
+		bar0_rw_offset ... used to write and read offset of bar0 where
+			bar0_data will be written or read.
+		bar0_data ... used to write and read data at bar0_rw_offset.
--- a/Documentation/ABI/testing/configfs-usb-gadget
+++ b/Documentation/ABI/testing/configfs-usb-gadget
@@ -12,24 +12,18 @@ Description:

 		The attributes of a gadget:

-		================  ============================================
-		UDC		  bind a gadget to UDC/unbind a gadget;
-				  write UDC's name found in /sys/class/udc/*
-				  to bind a gadget, empty string "" to unbind.
+		UDC		- bind a gadget to UDC/unbind a gadget;
+				write UDC's name found in /sys/class/udc/*
+				to bind a gadget, empty string "" to unbind.

-		max_speed	  maximum speed the driver supports. Valid
-				  names are super-speed-plus, super-speed,
-				  high-speed, full-speed, and low-speed.
-
-		bDeviceClass	  USB device class code
-		bDeviceSubClass	  USB device subclass code
-		bDeviceProtocol	  USB device protocol code
-		bMaxPacketSize0	  maximum endpoint 0 packet size
-		bcdDevice	  bcd device release number
-		bcdUSB		  bcd USB specification version number
-		idProduct	  product ID
-		idVendor	  vendor ID
-		================  ============================================
+		bDeviceClass	- USB device class code
+		bDeviceSubClass	- USB device subclass code
+		bDeviceProtocol	- USB device protocol code
+		bMaxPacketSize0	- maximum endpoint 0 packet size
+		bcdDevice	- bcd device release number
+		bcdUSB		- bcd USB specification version number
+		idProduct	- product ID
+		idVendor	- vendor ID

 What:		/config/usb-gadget/gadget/configs
 Date:		Jun 2013
@@ -43,10 +37,8 @@ KernelVersion:	3.11
 Description:
 		The attributes of a configuration:

-		================  ======================================
-		bmAttributes	  configuration characteristics
-		MaxPower	  maximum power consumption from the bus
-		================  ======================================
+		bmAttributes	- configuration characteristics
+		MaxPower	- maximum power consumption from the bus

 What:		/config/usb-gadget/gadget/configs/config/strings
 Date:		Jun 2013
@@ -61,9 +53,7 @@ KernelVersion:	3.11
 Description:
 		The attributes:

-		================  =========================
-		configuration	  configuration description
-		================  =========================
+		configuration	- configuration description


 What:		/config/usb-gadget/gadget/functions
@@ -82,10 +72,8 @@ Description:

 		The attributes:

-		=================	=====================================
-		compatible_id		8-byte string for "Compatible ID"
-		sub_compatible_id	8-byte string for "Sub Compatible ID"
-		=================	=====================================
+		compatible_id		- 8-byte string for "Compatible ID"
+		sub_compatible_id	- 8-byte string for "Sub Compatible ID"

 What:		/config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>/<property>
 Date:		May 2014
@@ -97,19 +85,16 @@ Description:

 		The attributes:

-		=====		===============================================
-		type		value 1..7 for interpreting the data
-
-				- 1: unicode string
-				- 2: unicode string with environment variable
-				- 3: binary
-				- 4: little-endian 32-bit
-				- 5: big-endian 32-bit
-				- 6: unicode string with a symbolic link
-				- 7: multiple unicode strings
-		data		blob of data to be interpreted depending on
+		type		- value 1..7 for interpreting the data
+				1: unicode string
+				2: unicode string with environment variable
+				3: binary
+				4: little-endian 32-bit
+				5: big-endian 32-bit
+				6: unicode string with a symbolic link
+				7: multiple unicode strings
+		data		- blob of data to be interpreted depending on
 				type
-		=====		===============================================

 What:		/config/usb-gadget/gadget/strings
 Date:		Jun 2013
@@ -124,11 +109,9 @@ KernelVersion:	3.11
 Description:
 		The attributes:

-		============	=================================
-		serialnumber	gadget's serial number (string)
-		product		gadget's product description
-		manufacturer	gadget's manufacturer description
-		============	=================================
+		serialnumber	- gadget's serial number (string)
+		product		- gadget's product description
+		manufacturer	- gadget's manufacturer description

 What:		/config/usb-gadget/gadget/os_desc
 Date:		May 2014
@@ -136,10 +119,8 @@ KernelVersion:	3.16
 Description:
 		This group contains "OS String" extension handling attributes.

-		=============	===============================================
-		use		flag turning "OS Desctiptors" support on/off
-		b_vendor_code	one-byte value used for custom per-device and
+		use		- flag turning "OS Desctiptors" support on/off
+		b_vendor_code	- one-byte value used for custom per-device and
 				per-interface requests
-		qw_sign		an identifier to be reported as "OS String"
+		qw_sign		- an identifier to be reported as "OS String"
 				proper
-		=============	===============================================
--- a/Documentation/ABI/testing/configfs-usb-gadget-ecm
+++ b/Documentation/ABI/testing/configfs-usb-gadget-ecm
@@ -4,17 +4,13 @@ KernelVersion:	3.11
 Description:
 		The attributes:

-		ifname
-			      - network device interface name associated with
+		ifname		- network device interface name associated with
 				this function instance
-		qmult	
-			      - queue length multiplier for high and
+		qmult		- queue length multiplier for high and
 				super speed
-		host_addr
-			      - MAC address of host's end of this
+		host_addr	- MAC address of host's end of this
 				Ethernet over USB link
-		dev_addr
-			      - MAC address of device's end of this
+		dev_addr	- MAC address of device's end of this
 				Ethernet over USB link


--- a/Documentation/ABI/testing/configfs-usb-gadget-eem
+++ b/Documentation/ABI/testing/configfs-usb-gadget-eem
@@ -4,13 +4,11 @@ KernelVersion:	3.11
 Description:
 		The attributes:

-		==========	=============================================
-		ifname		network device interface name associated with
+		ifname		- network device interface name associated with
 				this function instance
-		qmult		queue length multiplier for high and
+		qmult		- queue length multiplier for high and
 				super speed
-		host_addr	MAC address of host's end of this
+		host_addr	- MAC address of host's end of this
 				Ethernet over USB link
-		dev_addr	MAC address of device's end of this
+		dev_addr	- MAC address of device's end of this
 				Ethernet over USB link
-		==========	=============================================
--- a/Documentation/ABI/testing/configfs-usb-gadget-hid
+++ b/Documentation/ABI/testing/configfs-usb-gadget-hid
@@ -4,10 +4,8 @@ KernelVersion:	3.19
 Description:
 		The attributes:

-		=============	============================================
-		protocol	HID protocol to use
-		report_desc	blob corresponding to HID report descriptors
+		protocol	- HID protocol to use
+		report_desc	- blob corresponding to HID report descriptors
 				except the data passed through /dev/hidg<N>
-		report_length	HID report length
-		subclass	HID device subclass to use
-		=============	============================================
+		report_length	- HID report length
+		subclass	- HID device subclass to use
--- a/Documentation/ABI/testing/configfs-usb-gadget-loopback
+++ b/Documentation/ABI/testing/configfs-usb-gadget-loopback
@@ -4,7 +4,5 @@ KernelVersion:	3.13
 Description:
 		The attributes:

-		=======		=======================
-		qlen		depth of loopback queue
-		buflen		buffer length
-		=======		=======================
+		qlen		- depth of loopback queue
+		buflen		- buffer length
--- a/Documentation/ABI/testing/configfs-usb-gadget-mass-storage
+++ b/Documentation/ABI/testing/configfs-usb-gadget-mass-storage
@@ -4,14 +4,12 @@ KernelVersion:	3.13
 Description:
 		The attributes:

-		===========	==============================================
-		stall		Set to permit function to halt bulk endpoints.
+		stall		- Set to permit function to halt bulk endpoints.
 				Disabled on some USB devices known not to work
 				correctly. You should set it to true.
-		num_buffers	Number of pipeline buffers. Valid numbers
+		num_buffers	- Number of pipeline buffers. Valid numbers
 				are 2..4. Available only if
 				CONFIG_USB_GADGET_DEBUG_FILES is set.
-		===========	==============================================

 What:		/config/usb-gadget/gadget/functions/mass_storage.name/lun.name
 Date:		Oct 2013
@@ -19,17 +17,15 @@ KernelVersion:	3.13
 Description:
 		The attributes:

-		===========	==============================================
-		file		The path to the backing file for the LUN.
+		file		- The path to the backing file for the LUN.
 				Required if LUN is not marked as removable.
-		ro		Flag specifying access to the LUN shall be
+		ro		- Flag specifying access to the LUN shall be
 				read-only. This is implied if CD-ROM emulation
 				is enabled as well as when it was impossible
 				to open "filename" in R/W mode.
-		removable	Flag specifying that LUN shall be indicated as
+		removable	- Flag specifying that LUN shall be indicated as
 				being removable.
-		cdrom		Flag specifying that LUN shall be reported as
+		cdrom		- Flag specifying that LUN shall be reported as
 				being a CD-ROM.
-		nofua		Flag specifying that FUA flag
+		nofua		- Flag specifying that FUA flag
 				in SCSI WRITE(10,12)
-		===========	==============================================
--- a/Documentation/ABI/testing/configfs-usb-gadget-midi
+++ b/Documentation/ABI/testing/configfs-usb-gadget-midi
@@ -4,11 +4,9 @@ KernelVersion:	3.19
 Description:
 		The attributes:

-		==========	====================================
-		index		index value for the USB MIDI adapter
-		id		ID string for the USB MIDI adapter
-		buflen		MIDI buffer length
-		qlen		USB read request queue length
-		in_ports	number of MIDI input ports
-		out_ports	number of MIDI output ports
-		==========	====================================
+		index		- index value for the USB MIDI adapter
+		id		- ID string for the USB MIDI adapter
+		buflen		- MIDI buffer length
+		qlen		- USB read request queue length
+		in_ports	- number of MIDI input ports
+		out_ports	- number of MIDI output ports
--- a/Documentation/ABI/testing/configfs-usb-gadget-printer
+++ b/Documentation/ABI/testing/configfs-usb-gadget-printer
@@ -4,8 +4,6 @@ KernelVersion:	4.1
 Description:
 		The attributes:

-		==========      ===========================================
-		pnp_string	Data to be passed to the host in pnp string
-		q_len		Number of requests per endpoint
-		==========      ===========================================
+		pnp_string	- Data to be passed to the host in pnp string
+		q_len		- Number of requests per endpoint

--- a/Documentation/ABI/testing/configfs-usb-gadget-rndis
+++ b/Documentation/ABI/testing/configfs-usb-gadget-rndis
@@ -4,16 +4,14 @@ KernelVersion:	3.11
 Description:
 		The attributes:

-		=========	=============================================
-		ifname		network device interface name associated with
+		ifname		- network device interface name associated with
 				this function instance
-		qmult		queue length multiplier for high and
+		qmult		- queue length multiplier for high and
 				super speed
-		host_addr	MAC address of host's end of this
+		host_addr	- MAC address of host's end of this
 				Ethernet over USB link
-		dev_addr	MAC address of device's end of this
+		dev_addr	- MAC address of device's end of this
 				Ethernet over USB link
-		class		USB interface class, default is 02 (hex)
-		subclass	USB interface subclass, default is 06 (hex)
-		protocol	USB interface protocol, default is 00 (hex)
-		=========	=============================================
+		class		- USB interface class, default is 02 (hex)
+		subclass	- USB interface subclass, default is 06 (hex)
+		protocol	- USB interface protocol, default is 00 (hex)
--- a/Documentation/ABI/testing/configfs-usb-gadget-sourcesink
+++ b/Documentation/ABI/testing/configfs-usb-gadget-sourcesink
@@ -4,13 +4,11 @@ KernelVersion:	3.13
 Description:
 		The attributes:

-		==============    ==================================
-		pattern		  0 (all zeros), 1 (mod63), 2 (none)
-		isoc_interval	  1..16
-		isoc_maxpacket	  0 - 1023 (fs), 0 - 1024 (hs/ss)
-		isoc_mult	  0..2 (hs/ss only)
-		isoc_maxburst	  0..15 (ss only)
-		buflen		  buffer length
-		bulk_qlen	  depth of queue for bulk
-		iso_qlen	  depth of queue for iso
-		==============    ==================================
+		pattern		- 0 (all zeros), 1 (mod63), 2 (none)
+		isoc_interval	- 1..16
+		isoc_maxpacket	- 0 - 1023 (fs), 0 - 1024 (hs/ss)
+		isoc_mult	- 0..2 (hs/ss only)
+		isoc_maxburst	- 0..15 (ss only)
+		buflen		- buffer length
+		bulk_qlen	- depth of queue for bulk
+		iso_qlen	- depth of queue for iso
--- a/Documentation/ABI/testing/configfs-usb-gadget-subset
+++ b/Documentation/ABI/testing/configfs-usb-gadget-subset
@@ -4,13 +4,11 @@ KernelVersion:	3.11
 Description:
 		The attributes:

-		==========	=============================================
-		ifname		network device interface name associated with
+		ifname		- network device interface name associated with
 				this function instance
-		qmult		queue length multiplier for high and
+		qmult		- queue length multiplier for high and
 				super speed
-		host_addr	MAC address of host's end of this
+		host_addr	- MAC address of host's end of this
 				Ethernet over USB link
-		dev_addr	MAC address of device's end of this
+		dev_addr	- MAC address of device's end of this
 				Ethernet over USB link
-		==========	=============================================
--- a/Documentation/ABI/testing/configfs-usb-gadget-uac1
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uac1
@@ -4,13 +4,11 @@ KernelVersion:	4.14
 Description:
 		The attributes:

-		==========	===================================
-		c_chmask	capture channel mask
-		c_srate		capture sampling rate
-		c_ssize		capture sample size (bytes)
-		p_chmask	playback channel mask
-		p_srate		playback sampling rate
-		p_ssize		playback sample size (bytes)
-		req_number	the number of pre-allocated request
-				for both capture and playback
-		==========	===================================
+		c_chmask - capture channel mask
+		c_srate - capture sampling rate
+		c_ssize - capture sample size (bytes)
+		p_chmask - playback channel mask
+		p_srate - playback sampling rate
+		p_ssize - playback sample size (bytes)
+		req_number - the number of pre-allocated request
+			for both capture and playback
--- a/Documentation/ABI/testing/configfs-usb-gadget-uac2
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uac2
@@ -4,11 +4,9 @@ KernelVersion:	3.18
 Description:
 		The attributes:

-		=========  ============================
-		c_chmask   capture channel mask
-		c_srate    capture sampling rate
-		c_ssize    capture sample size (bytes)
-		p_chmask   playback channel mask
-		p_srate    playback sampling rate
-		p_ssize    playback sample size (bytes)
-		=========  ============================
+		c_chmask - capture channel mask
+		c_srate - capture sampling rate
+		c_ssize - capture sample size (bytes)
+		p_chmask - playback channel mask
+		p_srate - playback sampling rate
+		p_ssize - playback sample size (bytes)
--- a/Documentation/ABI/testing/configfs-usb-gadget-uvc
+++ b/Documentation/ABI/testing/configfs-usb-gadget-uvc
@@ -3,11 +3,9 @@ Date:		Dec 2014
 KernelVersion:	4.0
 Description:	UVC function directory

-		===================	=============================
-		streaming_maxburst	0..15 (ss only)
-		streaming_maxpacket	1..1023 (fs), 1..3072 (hs/ss)
-		streaming_interval	1..16
-		===================	=============================
+		streaming_maxburst	- 0..15 (ss only)
+		streaming_maxpacket	- 1..1023 (fs), 1..3072 (hs/ss)
+		streaming_interval	- 1..16

 What:		/config/usb-gadget/gadget/functions/uvc.name/control
 Date:		Dec 2014
@@ -15,11 +13,8 @@ KernelVersion:	4.0
 Description:	Control descriptors

 		All attributes read only:
-
-		================	=============================
-		bInterfaceNumber	USB interface number for this
-					streaming interface
-		================	=============================
+		bInterfaceNumber	- USB interface number for this
+					  streaming interface

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/class
 Date:		Dec 2014
@@ -52,16 +47,13 @@ KernelVersion:	4.0
 Description:	Default output terminal descriptors

 		All attributes read only:
-
-		==============	=============================================
-		iTerminal	index of string descriptor
-		bSourceID	id of the terminal to which this terminal
+		iTerminal	- index of string descriptor
+		bSourceID 	- id of the terminal to which this terminal
 				is connected
-		bAssocTerminal	id of the input terminal to which this output
+		bAssocTerminal	- id of the input terminal to which this output
 				terminal is associated
-		wTerminalType	terminal type
-		bTerminalID	a non-zero id of this terminal
-		==============	=============================================
+		wTerminalType	- terminal type
+		bTerminalID	- a non-zero id of this terminal

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/terminal/camera
 Date:		Dec 2014
@@ -74,19 +66,16 @@ KernelVersion:	4.0
 Description:	Default camera terminal descriptors

 		All attributes read only:
-
-		========================  ====================================
-		bmControls		  bitmap specifying which controls are
-					  supported for the video stream
-		wOcularFocalLength	  the value of Locular
-		wObjectiveFocalLengthMax  the value of Lmin
-		wObjectiveFocalLengthMin  the value of Lmax
-		iTerminal		  index of string descriptor
-		bAssocTerminal		  id of the output terminal to which
-					  this terminal is connected
-		wTerminalType		  terminal type
-		bTerminalID		  a non-zero id of this terminal
-		========================  ====================================
+		bmControls		- bitmap specifying which controls are
+					supported for the video stream
+		wOcularFocalLength	- the value of Locular
+		wObjectiveFocalLengthMax- the value of Lmin
+		wObjectiveFocalLengthMin- the value of Lmax
+		iTerminal		- index of string descriptor
+		bAssocTerminal		- id of the output terminal to which
+					this terminal is connected
+		wTerminalType		- terminal type
+		bTerminalID		- a non-zero id of this terminal

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/processing
 Date:		Dec 2014
@@ -99,16 +88,13 @@ KernelVersion:	4.0
 Description:	Default processing unit descriptors

 		All attributes read only:
-
-		===============	========================================
-		iProcessing	index of string descriptor
-		bmControls	bitmap specifying which controls are
+		iProcessing	- index of string descriptor
+		bmControls	- bitmap specifying which controls are
 				supported for the video stream
-		wMaxMultiplier	maximum digital magnification x100
-		bSourceID	id of the terminal to which this unit is
+		wMaxMultiplier	- maximum digital magnification x100
+		bSourceID	- id of the terminal to which this unit is
 				connected
-		bUnitID		a non-zero id of this unit
-		===============	========================================
+		bUnitID		- a non-zero id of this unit

 What:		/config/usb-gadget/gadget/functions/uvc.name/control/header
 Date:		Dec 2014
@@ -128,11 +114,8 @@ KernelVersion:	4.0
 Description:	Streaming descriptors

 		All attributes read only:
-
-		================	=============================
-		bInterfaceNumber	USB interface number for this
-					streaming interface
-		================	=============================
+		bInterfaceNumber	- USB interface number for this
+					  streaming interface

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/class
 Date:		Dec 2014
@@ -165,16 +148,13 @@ KernelVersion:	4.0
 Description:	Default color matching descriptors

 		All attributes read only:
-
-		========================  ======================================
-		bMatrixCoefficients	  matrix used to compute luma and
-					  chroma values from the color primaries
-		bTransferCharacteristics  optoelectronic transfer
-					  characteristic of the source picutre,
-					  also called the gamma function
-		bColorPrimaries		  color primaries and the reference
-					  white
-		========================  ======================================
+		bMatrixCoefficients	- matrix used to compute luma and
+					chroma values from the color primaries
+		bTransferCharacteristics- optoelectronic transfer
+					characteristic of the source picutre,
+					also called the gamma function
+		bColorPrimaries		- color primaries and the reference
+					white

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg
 Date:		Dec 2014
@@ -188,52 +168,47 @@ Description:	Specific MJPEG format descriptors

 		All attributes read only,
 		except bmaControls and bDefaultFrameIndex:
-
-		===================	=====================================
-		bFormatIndex		unique id for this format descriptor;
+		bFormatIndex		- unique id for this format descriptor;
 					only defined after parent header is
 					linked into the streaming class;
 					read-only
-		bmaControls		this format's data for bmaControls in
+		bmaControls		- this format's data for bmaControls in
 					the streaming header
-		bmInterfaceFlags	specifies interlace information,
+		bmInterfaceFlags	- specifies interlace information,
 					read-only
-		bAspectRatioY		the X dimension of the picture aspect
+		bAspectRatioY		- the X dimension of the picture aspect
 					ratio, read-only
-		bAspectRatioX		the Y dimension of the picture aspect
+		bAspectRatioX		- the Y dimension of the picture aspect
 					ratio, read-only
-		bmFlags			characteristics of this format,
+		bmFlags			- characteristics of this format,
 					read-only
-		bDefaultFrameIndex	optimum frame index for this stream
-		===================	=====================================
+		bDefaultFrameIndex	- optimum frame index for this stream

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/mjpeg/name/name
 Date:		Dec 2014
 KernelVersion:	4.0
 Description:	Specific MJPEG frame descriptors

-		=========================  =====================================
-		bFrameIndex		   unique id for this framedescriptor;
-					   only defined after parent format is
-					   linked into the streaming header;
-					   read-only
-		dwFrameInterval		   indicates how frame interval can be
-					   programmed; a number of values
-					   separated by newline can be specified
-		dwDefaultFrameInterval	   the frame interval the device would
-					   like to use as default
-		dwMaxVideoFrameBufferSize  the maximum number of bytes the
-					   compressor will produce for a video
-					   frame or still image
-		dwMaxBitRate		   the maximum bit rate at the shortest
-					   frame interval in bps
-		dwMinBitRate		   the minimum bit rate at the longest
-					   frame interval in bps
-		wHeight			   height of decoded bitmap frame in px
-		wWidth			   width of decoded bitmam frame in px
-		bmCapabilities		   still image support, fixed frame-rate
-					   support
-		=========================  =====================================
+		bFrameIndex		- unique id for this framedescriptor;
+					only defined after parent format is
+					linked into the streaming header;
+					read-only
+		dwFrameInterval		- indicates how frame interval can be
+					programmed; a number of values
+					separated by newline can be specified
+		dwDefaultFrameInterval	- the frame interval the device would
+					like to use as default
+		dwMaxVideoFrameBufferSize- the maximum number of bytes the
+					compressor will produce for a video
+					frame or still image
+		dwMaxBitRate		- the maximum bit rate at the shortest
+					frame interval in bps
+		dwMinBitRate		- the minimum bit rate at the longest
+					frame interval in bps
+		wHeight			- height of decoded bitmap frame in px
+		wWidth			- width of decoded bitmam frame in px
+		bmCapabilities		- still image support, fixed frame-rate
+					support

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed
 Date:		Dec 2014
@@ -245,54 +220,50 @@ Date:		Dec 2014
 KernelVersion:	4.0
 Description:	Specific uncompressed format descriptors

-		==================	=======================================
-		bFormatIndex		unique id for this format descriptor;
+		bFormatIndex		- unique id for this format descriptor;
 					only defined after parent header is
 					linked into the streaming class;
 					read-only
-		bmaControls		this format's data for bmaControls in
+		bmaControls		- this format's data for bmaControls in
 					the streaming header
-		bmInterfaceFlags	specifies interlace information,
+		bmInterfaceFlags	- specifies interlace information,
 					read-only
-		bAspectRatioY		the X dimension of the picture aspect
+		bAspectRatioY		- the X dimension of the picture aspect
 					ratio, read-only
-		bAspectRatioX		the Y dimension of the picture aspect
+		bAspectRatioX		- the Y dimension of the picture aspect
 					ratio, read-only
-		bDefaultFrameIndex	optimum frame index for this stream
-		bBitsPerPixel		number of bits per pixel used to
+		bDefaultFrameIndex	- optimum frame index for this stream
+		bBitsPerPixel		- number of bits per pixel used to
 					specify color in the decoded video
 					frame
-		guidFormat		globally unique id used to identify
+		guidFormat		- globally unique id used to identify
 					stream-encoding format
-		==================	=======================================

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/uncompressed/name/name
 Date:		Dec 2014
 KernelVersion:	4.0
 Description:	Specific uncompressed frame descriptors

-		=========================  =====================================
-		bFrameIndex		   unique id for this framedescriptor;
-					   only defined after parent format is
-					   linked into the streaming header;
-					   read-only
-		dwFrameInterval		   indicates how frame interval can be
-					   programmed; a number of values
-					   separated by newline can be specified
-		dwDefaultFrameInterval	   the frame interval the device would
-					   like to use as default
-		dwMaxVideoFrameBufferSize  the maximum number of bytes the
-					   compressor will produce for a video
-					   frame or still image
-		dwMaxBitRate		   the maximum bit rate at the shortest
-					   frame interval in bps
-		dwMinBitRate		   the minimum bit rate at the longest
-					   frame interval in bps
-		wHeight			   height of decoded bitmap frame in px
-		wWidth			   width of decoded bitmam frame in px
-		bmCapabilities		   still image support, fixed frame-rate
-					   support
-		=========================  =====================================
+		bFrameIndex		- unique id for this framedescriptor;
+					only defined after parent format is
+					linked into the streaming header;
+					read-only
+		dwFrameInterval		- indicates how frame interval can be
+					programmed; a number of values
+					separated by newline can be specified
+		dwDefaultFrameInterval	- the frame interval the device would
+					like to use as default
+		dwMaxVideoFrameBufferSize- the maximum number of bytes the
+					compressor will produce for a video
+					frame or still image
+		dwMaxBitRate		- the maximum bit rate at the shortest
+					frame interval in bps
+		dwMinBitRate		- the minimum bit rate at the longest
+					frame interval in bps
+		wHeight			- height of decoded bitmap frame in px
+		wWidth			- width of decoded bitmam frame in px
+		bmCapabilities		- still image support, fixed frame-rate
+					support

 What:		/config/usb-gadget/gadget/functions/uvc.name/streaming/header
 Date:		Dec 2014
@@ -305,20 +276,17 @@ KernelVersion:	4.0
 Description:	Specific streaming header descriptors

 		All attributes read only:
-
-		====================	=====================================
-		bTriggerUsage		how the host software will respond to
+		bTriggerUsage		- how the host software will respond to
 					a hardware trigger interrupt event
-		bTriggerSupport		flag specifying if hardware
+		bTriggerSupport		- flag specifying if hardware
 					triggering is supported
-		bStillCaptureMethod	method of still image caputre
+		bStillCaptureMethod	- method of still image caputre
 					supported
-		bTerminalLink		id of the output terminal to which
+		bTerminalLink		- id of the output terminal to which
 					the video endpoint of this interface
 					is connected
-		bmInfo			capabilities of this video streaming
+		bmInfo			- capabilities of this video streaming
 					interface
-		====================	=====================================

 What:		/sys/class/udc/udc.name/device/gadget/video4linux/video.name/function_name
 Date:		May 2018
--- a/Documentation/ABI/testing/debugfs-cec-error-inj
+++ b/Documentation/ABI/testing/debugfs-cec-error-inj
@@ -23,7 +23,7 @@ error injections without having to know the details of the driver-specific
 commands.

 Note that the output of 'error-inj' shall be valid as input to 'error-inj'.
-So this must work::
+So this must work:

 	$ cat error-inj >einj.txt
 	$ cat einj.txt >error-inj
@@ -37,4 +37,4 @@ when changes are made.

 The following CEC error injection implementations exist:

- Documentation/userspace-api/media/cec/cec-pin-error-inj.rst
+- Documentation/media/uapi/cec/cec-pin-error-inj.rst
--- a/Documentation/ABI/testing/debugfs-driver-habanalabs
+++ b/Documentation/ABI/testing/debugfs-driver-habanalabs
@@ -8,29 +8,6 @@ Description:    Sets the device address to be used for read or write through
                only when the IOMMU is disabled.
                The acceptable value is a string that starts with "0x"

-What:           /sys/kernel/debug/habanalabs/hl<n>/clk_gate
-Date:           May 2020
-KernelVersion:  5.8
-Contact:        oded.gabbay@gmail.com
-Description:    Allow the root user to disable/enable in runtime the clock
-                gating mechanism in Gaudi. Due to how Gaudi is built, the
-                clock gating needs to be disabled in order to access the
-                registers of the TPC and MME engines. This is sometimes needed
-                during debug by the user and hence the user needs this option.
-                The user can supply a bitmask value, each bit represents
-                a different engine to disable/enable its clock gating feature.
-                The bitmask is composed of 20 bits:
-
-		=======   ============
-                0  -  7   DMA channels
-                8  - 11   MME engines
-                12 - 19   TPC engines
-		=======   ============
-
-                The bit's location of a specific engine can be determined
-                using (1 << GAUDI_ENGINE_ID_*). GAUDI_ENGINE_ID_* values
-                are defined in uapi habanalabs.h file in enum gaudi_engine_id
-
 What:           /sys/kernel/debug/habanalabs/hl<n>/command_buffers
 Date:           Jan 2019
 KernelVersion:  5.1
@@ -63,22 +40,6 @@ Description:    Allows the root user to read or write directly through the
                the generic Linux user-space PCI mapping) because the DDR bar
                is very small compared to the DDR memory and only the driver can
                move the bar before and after the transaction.
-
-                If the IOMMU is disabled, it also allows the root user to read
-                or write from the host a device VA of a host mapped memory
-
-What:           /sys/kernel/debug/habanalabs/hl<n>/data64
-Date:           Jan 2020
-KernelVersion:  5.6
-Contact:        oded.gabbay@gmail.com
-Description:    Allows the root user to read or write 64 bit data directly
-                through the device's PCI bar. Writing to this file generates a
-                write transaction while reading from the file generates a read
-                transaction. This custom interface is needed (instead of using
-                the generic Linux user-space PCI mapping) because the DDR bar
-                is very small compared to the DDR memory and only the driver can
-                move the bar before and after the transaction.
-
                If the IOMMU is disabled, it also allows the root user to read
                or write from the host a device VA of a host mapped memory

@@ -175,10 +136,3 @@ KernelVersion:  5.1
 Contact:        oded.gabbay@gmail.com
 Description:    Displays a list with information about all the active virtual
                address mappings per ASID
-
-What:           /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
-Date:           Mar 2020
-KernelVersion:  5.6
-Contact:        oded.gabbay@gmail.com
-Description:    Sets the stop-on_error option for the device engines. Value of
-                "0" is for disable, otherwise enable.
--- a/Documentation/ABI/testing/debugfs-ec
+++ b/Documentation/ABI/testing/debugfs-ec
@@ -6,7 +6,7 @@ Description:
 General information like which GPE is assigned to the EC and whether
 the global lock should get used.
 Knowing the EC GPE one can watch the amount of HW events related to
-the EC here (XY -> GPE number from `/sys/kernel/debug/ec/*/gpe`):
+the EC here (XY -> GPE number from /sys/kernel/debug/ec/*/gpe):
 /sys/firmware/acpi/interrupts/gpeXY

 The io file is binary and a userspace tool located here:
@@ -14,8 +14,7 @@ ftp://ftp.suse.com/pub/people/trenn/sources/ec/
 should get used to read out the 256 Embedded Controller registers
 or writing to them.

-CAUTION:
-  Do not write to the Embedded Controller if you don't know
-  what you are doing! Rebooting afterwards also is a good idea.
-  This can influence the way your machine is cooled and fans may
-  not get switched on again after you did a wrong write.
+CAUTION: Do not write to the Embedded Controller if you don't know
+what you are doing! Rebooting afterwards also is a good idea.
+This can influence the way your machine is cooled and fans may
+not get switched on again after you did a wrong write.
--- a/Documentation/ABI/testing/debugfs-hisi-hpre
+++ b/Documentation/ABI/testing/debugfs-hisi-hpre
@@ -1,140 +0,0 @@
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/cluster[0-3]/regs
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump debug registers from the HPRE cluster.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/cluster[0-3]/cluster_ctrl
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    Write the HPRE core selection in the cluster into this file,
-		and then we can read the debug information of the core.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/rdclr_en
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    HPRE cores debug registers read clear control. 1 means enable
-		register read clear, otherwise 0. Writing to this file has no
-		functional effect, only enable or disable counters clear after
-		reading of these registers.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/current_qm
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    One HPRE controller has one PF and multiple VFs, each function
-		has a QM. Select the QM which below qm refers to.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/regs
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump debug registers from the HPRE.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/regs
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump debug registers from the QM.
-		Available for PF and VF in host. VF in guest currently only
-		has one debug register.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/current_q
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    One QM may contain multiple queues. Select specific queue to
-		show its debug registers in above regs.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/clear_enable
-Date:           Sep 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    QM debug registers(regs) read clear control. 1 means enable
-		register read clear, otherwise 0.
-		Writing to this file has no functional effect, only enable or
-		disable counters clear after reading of these registers.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/err_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of invalid interrupts for
-		QM task completion.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/aeq_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of QM async event queue interrupts.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/abnormal_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of interrupts for QM abnormal event.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/create_qp_err
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of queue allocation errors.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/mb_err
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of failed QM mailbox commands.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/qm/status
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the status of the QM.
-		Four states: initiated, started, stopped and closed.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/send_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of sent requests.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/recv_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of received requests.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/send_busy_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of requests sent
-		with returning busy.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/send_fail_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of completed but error requests.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/invalid_req_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of invalid requests being received.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/overtime_thrhld
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Set the threshold time for counting the request which is
-		processed longer than the threshold.
-		0: disable(default), 1: 1 microsecond.
-		Available for both PF and VF, and take no other effect on HPRE.
-
-What:           /sys/kernel/debug/hisi_hpre/<bdf>/hpre_dfx/over_thrhld_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of time out requests.
-		Available for both PF and VF, and take no other effect on HPRE.
--- a/Documentation/ABI/testing/debugfs-hisi-sec
+++ b/Documentation/ABI/testing/debugfs-hisi-sec
@@ -1,113 +0,0 @@
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/clear_enable
-Date:           Oct 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    Enabling/disabling of clear action after reading
-		the SEC debug registers.
-		0: disable, 1: enable.
-		Only available for PF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/current_qm
-Date:           Oct 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    One SEC controller has one PF and multiple VFs, each function
-		has a QM. This file can be used to select the QM which below
-		qm refers to.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_regs
-Date:           Oct 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump of QM related debug registers.
-		Available for PF and VF in host. VF in guest currently only
-		has one debug register.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/current_q
-Date:           Oct 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    One QM of SEC may contain multiple queues. Select specific
-		queue to show its debug registers in above 'regs'.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/clear_enable
-Date:           Oct 2019
-Contact:        linux-crypto@vger.kernel.org
-Description:    Enabling/disabling of clear action after reading
-		the SEC's QM debug registers.
-		0: disable, 1: enable.
-		Only available for PF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/err_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of invalid interrupts for
-		QM task completion.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/aeq_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of QM async event queue interrupts.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/abnormal_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of interrupts for QM abnormal event.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/create_qp_err
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of queue allocation errors.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/mb_err
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of failed QM mailbox commands.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/qm/status
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the status of the QM.
-		Four states: initiated, started, stopped and closed.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/send_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of sent requests.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/recv_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of received requests.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/send_busy_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of requests sent with returning busy.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/err_bd_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of BD type error requests
-		to be received.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/invalid_req_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of invalid requests being received.
-		Available for both PF and VF, and take no other effect on SEC.
-
-What:           /sys/kernel/debug/hisi_sec2/<bdf>/sec_dfx/done_flag_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of completed but marked error requests
-		to be received.
-		Available for both PF and VF, and take no other effect on SEC.
--- a/Documentation/ABI/testing/debugfs-hisi-zip
+++ b/Documentation/ABI/testing/debugfs-hisi-zip
@@ -1,114 +0,0 @@
-What:           /sys/kernel/debug/hisi_zip/<bdf>/comp_core[01]/regs
-Date:           Nov 2018
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump of compression cores related debug registers.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/decomp_core[0-5]/regs
-Date:           Nov 2018
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump of decompression cores related debug registers.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/clear_enable
-Date:           Nov 2018
-Contact:        linux-crypto@vger.kernel.org
-Description:    Compression/decompression core debug registers read clear
-		control. 1 means enable register read clear, otherwise 0.
-		Writing to this file has no functional effect, only enable or
-		disable counters clear after reading of these registers.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/current_qm
-Date:           Nov 2018
-Contact:        linux-crypto@vger.kernel.org
-Description:    One ZIP controller has one PF and multiple VFs, each function
-		has a QM. Select the QM which below qm refers to.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/regs
-Date:           Nov 2018
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump of QM related debug registers.
-		Available for PF and VF in host. VF in guest currently only
-		has one debug register.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/current_q
-Date:           Nov 2018
-Contact:        linux-crypto@vger.kernel.org
-Description:    One QM may contain multiple queues. Select specific queue to
-		show its debug registers in above regs.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/clear_enable
-Date:           Nov 2018
-Contact:        linux-crypto@vger.kernel.org
-Description:    QM debug registers(regs) read clear control. 1 means enable
-		register read clear, otherwise 0.
-		Writing to this file has no functional effect, only enable or
-		disable counters clear after reading of these registers.
-		Only available for PF.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/err_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of invalid interrupts for
-		QM task completion.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/aeq_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of QM async event queue interrupts.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/abnormal_irq
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of interrupts for QM abnormal event.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/create_qp_err
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of queue allocation errors.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/mb_err
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the number of failed QM mailbox commands.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/qm/status
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the status of the QM.
-		Four states: initiated, started, stopped and closed.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/send_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of sent requests.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/recv_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of received requests.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/send_busy_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of requests received
-		with returning busy.
-		Available for both PF and VF, and take no other effect on ZIP.
-
-What:           /sys/kernel/debug/hisi_zip/<bdf>/zip_dfx/err_bd_cnt
-Date:           Apr 2020
-Contact:        linux-crypto@vger.kernel.org
-Description:    Dump the total number of BD type error requests
-		to be received.
-		Available for both PF and VF, and take no other effect on ZIP.
--- a/Documentation/ABI/testing/debugfs-hyperv
+++ b/Documentation/ABI/testing/debugfs-hyperv
@@ -1,23 +0,0 @@
-What:           /sys/kernel/debug/hyperv/<UUID>/fuzz_test_state
-Date:           October 2019
-KernelVersion:  5.5
-Contact:        Branden Bonaby <brandonbonaby94@gmail.com>
-Description:    Fuzz testing status of a vmbus device, whether its in an ON
-                state or a OFF state
-Users:          Debugging tools
-
-What:           /sys/kernel/debug/hyperv/<UUID>/delay/fuzz_test_buffer_interrupt_delay
-Date:           October 2019
-KernelVersion:  5.5
-Contact:        Branden Bonaby <brandonbonaby94@gmail.com>
-Description:    Fuzz testing buffer interrupt delay value between 0 - 1000
-		 microseconds (inclusive).
-Users:          Debugging tools
-
-What:           /sys/kernel/debug/hyperv/<UUID>/delay/fuzz_test_message_delay
-Date:           October 2019
-KernelVersion:  5.5
-Contact:        Branden Bonaby <brandonbonaby94@gmail.com>
-Description:    Fuzz testing message delay value between 0 - 1000 microseconds
-		 (inclusive).
-Users:          Debugging tools
--- a/Documentation/ABI/testing/debugfs-moxtet
+++ b/Documentation/ABI/testing/debugfs-moxtet
@@ -1,35 +0,0 @@
-What:		/sys/kernel/debug/moxtet/input
-Date:		March 2019
-KernelVersion:	5.3
-Contact:	Marek Behún <marek.behun@nic.cz>
-Description:	(Read) Read input from the shift registers, in hexadecimal.
-		Returns N+1 bytes, where N is the number of Moxtet connected
-		modules. The first byte is from the CPU board itself.
-
-		Example::
-
-			101214
-
-		==  =======================================
-		10  CPU board with SD card
-		12  2 = PCIe module, 1 = IRQ not active
-		14  4 = Peridot module, 1 = IRQ not active
-		==  =======================================
-
-What:		/sys/kernel/debug/moxtet/output
-Date:		March 2019
-KernelVersion:	5.3
-Contact:	Marek Behún <marek.behun@nic.cz>
-Description:	(RW) Read last written value to the shift registers, in
-		hexadecimal, or write values to the shift registers, also
-		in hexadecimal.
-
-		Example::
-
-		    0102
-
-		==  ================================================
-		01  01 was last written, or is to be written, to the
-		    first module's shift register
-		02  the same for second module
-		==  ================================================
--- a/Documentation/ABI/testing/debugfs-pfo-nx-crypto
+++ b/Documentation/ABI/testing/debugfs-pfo-nx-crypto
@@ -4,42 +4,42 @@ KernelVersion:	3.4
 Contact:	Kent Yoder <key@linux.vnet.ibm.com>
 Description:

-These debugfs interfaces are built by the nx-crypto driver, built in
+  These debugfs interfaces are built by the nx-crypto driver, built in
 arch/powerpc/crypto/nx.

 Error Detection
 ===============

 errors:
-  A u32 providing a total count of errors since the driver was loaded. The
-  only errors counted here are those returned from the hcall, H_COP_OP.
+- A u32 providing a total count of errors since the driver was loaded. The
+only errors counted here are those returned from the hcall, H_COP_OP.

 last_error:
-  The most recent non-zero return code from the H_COP_OP hcall. -EBUSY is not
-  recorded here (the hcall will retry until -EBUSY goes away).
+- The most recent non-zero return code from the H_COP_OP hcall. -EBUSY is not
+recorded here (the hcall will retry until -EBUSY goes away).

 last_error_pid:
-  The process ID of the process who received the most recent error from the
-  hcall.
+- The process ID of the process who received the most recent error from the
+hcall.

 Device Use
 ==========

 aes_bytes:
-  The total number of bytes encrypted using AES in any of the driver's
-  supported modes.
+- The total number of bytes encrypted using AES in any of the driver's
+supported modes.

 aes_ops:
-  The total number of AES operations submitted to the hardware.
+- The total number of AES operations submitted to the hardware.

 sha256_bytes:
-  The total number of bytes hashed by the hardware using SHA-256.
+- The total number of bytes hashed by the hardware using SHA-256.

 sha256_ops:
-  The total number of SHA-256 operations submitted to the hardware.
+- The total number of SHA-256 operations submitted to the hardware.

 sha512_bytes:
-  The total number of bytes hashed by the hardware using SHA-512.
+- The total number of bytes hashed by the hardware using SHA-512.

 sha512_ops:
-  The total number of SHA-512 operations submitted to the hardware.
+- The total number of SHA-512 operations submitted to the hardware.
--- a/Documentation/ABI/testing/debugfs-pktcdvd
+++ b/Documentation/ABI/testing/debugfs-pktcdvd
@@ -4,15 +4,16 @@ KernelVersion:  2.6.20
 Contact:        Thomas Maier <balagi@justmail.de>
 Description:

+debugfs interface
+-----------------
+
 The pktcdvd module (packet writing driver) creates
 these files in debugfs:

 /sys/kernel/debug/pktcdvd/pktcdvd[0-7]/
+    info            (0444) Lots of driver statistics and infos.

-    ====            ====== ====================================
-    info            0444   Lots of driver statistics and infos.
-    ====            ====== ====================================
+Example:
+-------

-Example::
-
-    cat /sys/kernel/debug/pktcdvd/pktcdvd0/info
+cat /sys/kernel/debug/pktcdvd/pktcdvd0/info
--- a/Documentation/ABI/testing/debugfs-turris-mox-rwtm
+++ b/Documentation/ABI/testing/debugfs-turris-mox-rwtm
@@ -1,14 +0,0 @@
-What:		/sys/kernel/debug/turris-mox-rwtm/do_sign
-Date:		Jun 2020
-KernelVersion:	5.8
-Contact:	Marek Behún <marek.behun@nic.cz>
-Description:
-
-		======= ===========================================================
-		(Write) Message to sign with the ECDSA private key stored in
-		        device's OTP. The message must be exactly 64 bytes
-		        (since this is intended for SHA-512 hashes).
-		(Read)  The resulting signature, 136 bytes. This contains the
-			R and S values of the ECDSA signature, both in
-			big-endian format.
-		======= ===========================================================
--- a/Documentation/ABI/testing/debugfs-wilco-ec
+++ b/Documentation/ABI/testing/debugfs-wilco-ec
@@ -27,17 +27,16 @@ Description:
 		for writing, two for the type and at least a single byte of
 		data.

-		Example::
-
-		    // Request EC info type 3 (EC firmware build date)
-		    // Corresponds with sending type 0x00f0 with
-		    // MBOX = [38, 00, 03, 00]
-		    $ echo 00 f0 38 00 03 00 > /sys/kernel/debug/wilco_ec/raw
-		    // View the result. The decoded ASCII result "12/21/18" is
-		    // included after the raw hex.
-		    // Corresponds with MBOX = [00, 00, 31, 32, 2f, 32, 31, 38, ...]
-		    $ cat /sys/kernel/debug/wilco_ec/raw
-		    00 00 31 32 2f 32 31 2f 31 38 00 38 00 01 00 2f 00  ..12/21/18.8...
+		Example:
+		// Request EC info type 3 (EC firmware build date)
+		// Corresponds with sending type 0x00f0 with
+		// MBOX = [38, 00, 03, 00]
+		$ echo 00 f0 38 00 03 00 > /sys/kernel/debug/wilco_ec/raw
+		// View the result. The decoded ASCII result "12/21/18" is
+		// included after the raw hex.
+		// Corresponds with MBOX = [00, 00, 31, 32, 2f, 32, 31, 38, ...]
+		$ cat /sys/kernel/debug/wilco_ec/raw
+		00 00 31 32 2f 32 31 2f 31 38 00 38 00 01 00 2f 00  ..12/21/18.8...

 		Note that the first 16 bytes of the received MBOX[] will be
 		printed, even if some of the data is junk, and skipping bytes
--- a/Documentation/ABI/testing/dell-smbios-wmi
+++ b/Documentation/ABI/testing/dell-smbios-wmi
@@ -10,29 +10,29 @@ Description:
 		<uapi/linux/wmi.h>

 		1) To perform an SMBIOS call from userspace, you'll need to
-		   first determine the minimum size of the calling interface
-		   buffer for your machine.
-		   Platforms that contain larger buffers can return larger
-		   objects from the system firmware.
-		   Commonly this size is either 4k or 32k.
+		first determine the minimum size of the calling interface
+		buffer for your machine.
+		Platforms that contain larger buffers can return larger
+		objects from the system firmware.
+		Commonly this size is either 4k or 32k.

-		   To determine the size of the buffer read() a u64 dword from
-		   the WMI character device /dev/wmi/dell-smbios.
+		To determine the size of the buffer read() a u64 dword from
+		the WMI character device /dev/wmi/dell-smbios.

 		2) After you've determined the minimum size of the calling
-		   interface buffer, you can allocate a structure that represents
-		   the structure documented above.
+		interface buffer, you can allocate a structure that represents
+		the structure documented above.

 		3) In the 'length' object store the size of the buffer you
-		   determined above and allocated.
+		determined above and allocated.

 		4) In this buffer object, prepare as necessary for the SMBIOS
-		   call you're interested in.  Typically SMBIOS buffers have
-		   "class", "select", and "input" defined to values that coincide
-		   with the data you are interested in.
-		   Documenting class/select/input values is outside of the scope
-		   of this documentation. Check with the libsmbios project for
-		   further documentation on these values.
+		call you're interested in.  Typically SMBIOS buffers have
+		"class", "select", and "input" defined to values that coincide
+		with the data you are interested in.
+		Documenting class/select/input values is outside of the scope
+		of this documentation. Check with the libsmbios project for
+		further documentation on these values.

 		6) Run the call by using ioctl() as described in the header.

--- a/Documentation/ABI/testing/dev-kmsg
+++ b/Documentation/ABI/testing/dev-kmsg
@@ -6,14 +6,13 @@ Description:	The /dev/kmsg character device node provides userspace access
 		to the kernel's printk buffer.

 		Injecting messages:
-
 		Every write() to the opened device node places a log entry in
 		the kernel's printk buffer.

 		The logged line can be prefixed with a <N> syslog prefix, which
 		carries the syslog priority and facility. The single decimal
 		prefix number is composed of the 3 lowest bits being the syslog
-		priority and the next 8 bits the syslog facility number.
+		priority and the higher bits the syslog facility number.

 		If no prefix is given, the priority number is the default kernel
 		log priority and the facility number is set to LOG_USER (1). It
@@ -22,7 +21,6 @@ Description:	The /dev/kmsg character device node provides userspace access
 		the messages can always be reliably determined.

 		Accessing the buffer:
-
 		Every read() from the opened device node receives one record
 		of the kernel's printk buffer.

@@ -50,7 +48,6 @@ Description:	The /dev/kmsg character device node provides userspace access
 		if needed, without limiting the interface to a single reader.

 		The device supports seek with the following parameters:
-
 		SEEK_SET, 0
 		  seek to the first entry in the buffer
 		SEEK_END, 0
@@ -59,17 +56,6 @@ Description:	The /dev/kmsg character device node provides userspace access
 		  seek after the last record available at the time
 		  the last SYSLOG_ACTION_CLEAR was issued.

-		Other seek operations or offsets are not supported because of
-		the special behavior this device has. The device allows to read
-		or write only whole variable length messages (records) that are
-		stored in a ring buffer.
-
-		Because of the non-standard behavior also the error values are
-		non-standard. -ESPIPE is returned for non-zero offset. -EINVAL
-		is returned for other operations, e.g. SEEK_CUR. This behavior
-		and values are historical and could not be modified without the
-		risk of breaking userspace.
-
 		The output format consists of a prefix carrying the syslog
 		prefix including priority and facility, the 64 bit message
 		sequence number and the monotonic timestamp in microseconds,
@@ -90,30 +76,27 @@ Description:	The /dev/kmsg character device node provides userspace access
 		readable context of the message, for reliable processing in
 		userspace.

-		Example::
-
-		  7,160,424069,-;pci_root PNP0A03:00: host bridge window [io  0x0000-0x0cf7] (ignored)
-		   SUBSYSTEM=acpi
-		   DEVICE=+acpi:PNP0A03:00
-		  6,339,5140900,-;NET: Registered protocol family 10
-		  30,340,5690716,-;udevd[80]: starting version 181
+		Example:
+		7,160,424069,-;pci_root PNP0A03:00: host bridge window [io  0x0000-0x0cf7] (ignored)
+		 SUBSYSTEM=acpi
+		 DEVICE=+acpi:PNP0A03:00
+		6,339,5140900,-;NET: Registered protocol family 10
+		30,340,5690716,-;udevd[80]: starting version 181

 		The DEVICE= key uniquely identifies devices the following way:
-
-		  ============  =================
-		  b12:8         block dev_t
-		  c127:3        char dev_t
-		  n8            netdev ifindex
-		  +sound:card0  subsystem:devname
-		  ============  =================
+		  b12:8        - block dev_t
+		  c127:3       - char dev_t
+		  n8           - netdev ifindex
+		  +sound:card0 - subsystem:devname

 		The flags field carries '-' by default. A 'c' indicates a
-		fragment of a line. Note, that these hints about continuation
-		lines are not necessarily correct, and the stream could be
-		interleaved with unrelated messages, but merging the lines in
-		the output usually produces better human readable results. A
-		similar logic is used internally when messages are printed to
-		the console, /proc/kmsg or the syslog() syscall.
+		fragment of a line. All following fragments are flagged with
+		'+'. Note, that these hints about continuation lines are not
+		necessarily correct, and the stream could be interleaved with
+		unrelated messages, but merging the lines in the output
+		usually produces better human readable results. A similar
+		logic is used internally when messages are printed to the
+		console, /proc/kmsg or the syslog() syscall.

 		By default, kernel tries to avoid fragments by concatenating
 		when it can and fragments are rare; however, when extended
--- a/Documentation/ABI/testing/evm
+++ b/Documentation/ABI/testing/evm
@@ -17,33 +17,26 @@ Description:
 		echoing a value to <securityfs>/evm made up of the
 		following bits:

-		===	  ==================================================
 		Bit	  Effect
-		===	  ==================================================
 		0	  Enable HMAC validation and creation
 		1	  Enable digital signature validation
 		2	  Permit modification of EVM-protected metadata at
 			  runtime. Not supported if HMAC validation and
 			  creation is enabled.
 		31	  Disable further runtime modification of EVM policy
-		===	  ==================================================

-		For example::
+		For example:

-		  echo 1 ><securityfs>/evm
+		echo 1 ><securityfs>/evm

 		will enable HMAC validation and creation

-		::
-
-		  echo 0x80000003 ><securityfs>/evm
+		echo 0x80000003 ><securityfs>/evm

 		will enable HMAC and digital signature validation and
 		HMAC creation and disable all further modification of policy.

-		::
-
-		  echo 0x80000006 ><securityfs>/evm
+		echo 0x80000006 ><securityfs>/evm

 		will enable digital signature validation, permit
 		modification of EVM-protected metadata and
@@ -72,7 +65,7 @@ Description:
 		Shows the set of extended attributes used to calculate or
 		validate the EVM signature, and allows additional attributes
 		to be added at runtime. Any signatures generated after
-		additional attributes are added (and on files possessing those
+		additional attributes are added (and on files posessing those
 		additional attributes) will only be valid if the same
 		additional attributes are configured on system boot. Writing
 		a single period (.) will lock the xattr list from any further
--- a/Documentation/ABI/testing/gpio-cdev
+++ b/Documentation/ABI/testing/gpio-cdev
@@ -12,16 +12,15 @@ Description:
 		The following file operations are supported:

 		open(2)
-		  Currently the only useful flags are O_RDWR.
+		Currently the only useful flags are O_RDWR.

 		ioctl(2)
-		  Initiate various actions.
-
-		  See the inline documentation in [include/uapi]<linux/gpio.h>
-		  for descriptions of all ioctls.
+		Initiate various actions.
+		See the inline documentation in [include/uapi]<linux/gpio.h>
+		for descriptions of all ioctls.

 		close(2)
-		  Stops and free up the I/O contexts that was associated
-		  with the file descriptor.
+		Stops and free up the I/O contexts that was associated
+		with the file descriptor.

 Users:		TBD
--- a/Documentation/ABI/testing/ima_policy
+++ b/Documentation/ABI/testing/ima_policy
@@ -15,24 +15,20 @@ Description:
 		IMA appraisal, if configured, uses these file measurements
 		for local measurement appraisal.

-		::
+		rule format: action [condition ...]

-		  rule format: action [condition ...]
-
-		  action: measure | dont_measure | appraise | dont_appraise |
-			  audit | hash | dont_hash
-		  condition:= base | lsm  [option]
+		action: measure | dont_measure | appraise | dont_appraise |
+			audit | hash | dont_hash
+		condition:= base | lsm  [option]
 			base:	[[func=] [mask=] [fsmagic=] [fsuuid=] [uid=]
 				[euid=] [fowner=] [fsname=]]
 			lsm:	[[subj_user=] [subj_role=] [subj_type=]
 				 [obj_user=] [obj_role=] [obj_type=]]
 			option:	[[appraise_type=]] [template=] [permit_directio]
-				[appraise_flag=] [keyrings=]
-		  base:
-			func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK]MODULE_CHECK]
-			        [FIRMWARE_CHECK]
+		base: 	func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK][MODULE_CHECK]
+				[FIRMWARE_CHECK]
 				[KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK]
-				[KEXEC_CMDLINE] [KEY_CHECK]
+				[KEXEC_CMDLINE]
 			mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
 			       [[^]MAY_EXEC]
 			fsmagic:= hex value
@@ -40,20 +36,13 @@ Description:
 			uid:= decimal value
 			euid:= decimal value
 			fowner:= decimal value
-		  lsm:  are LSM specific
-		  option:
-			appraise_type:= [imasig] [imasig|modsig]
-			appraise_flag:= [check_blacklist]
-			Currently, blacklist check is only for files signed with appended
-			signature.
-			keyrings:= list of keyrings
-			(eg, .builtin_trusted_keys|.ima). Only valid
-			when action is "measure" and func is KEY_CHECK.
+		lsm:  	are LSM specific
+		option:	appraise_type:= [imasig]
 			template:= name of a defined IMA template type
 			(eg, ima-ng). Only valid when action is "measure".
 			pcr:= decimal value

-		  default policy:
+		default policy:
 			# PROC_SUPER_MAGIC
 			dont_measure fsmagic=0x9fa0
 			dont_appraise fsmagic=0x9fa0
@@ -101,8 +90,7 @@ Description:

 		Examples of LSM specific definitions:

-		SELinux::
-
+		SELinux:
 			dont_measure obj_type=var_log_t
 			dont_appraise obj_type=var_log_t
 			dont_measure obj_type=auditd_log_t
@@ -110,24 +98,10 @@ Description:
 			measure subj_user=system_u func=FILE_CHECK mask=MAY_READ
 			measure subj_role=system_r func=FILE_CHECK mask=MAY_READ

-		Smack::
-
+		Smack:
 			measure subj_user=_ func=FILE_CHECK mask=MAY_READ

-		Example of measure rules using alternate PCRs::
+		Example of measure rules using alternate PCRs:

 			measure func=KEXEC_KERNEL_CHECK pcr=4
 			measure func=KEXEC_INITRAMFS_CHECK pcr=5
-
-		Example of appraise rule allowing modsig appended signatures:
-
-			appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig|modsig
-
-		Example of measure rule using KEY_CHECK to measure all keys:
-
-			measure func=KEY_CHECK
-
-		Example of measure rule using KEY_CHECK to only measure
-		keys added to .builtin_trusted_keys or .ima keyring:
-
-			measure func=KEY_CHECK keyrings=.builtin_trusted_keys|.ima
--- a/Documentation/ABI/testing/procfs-diskstats
+++ b/Documentation/ABI/testing/procfs-diskstats
@@ -6,38 +6,27 @@ Description:
 		of block devices. Each line contains the following 14
 		fields:

-		==  ===================================
-		 1  major number
-		 2  minor mumber
-		 3  device name
-		 4  reads completed successfully
-		 5  reads merged
-		 6  sectors read
-		 7  time spent reading (ms)
-		 8  writes completed
-		 9  writes merged
-		10  sectors written
-		11  time spent writing (ms)
-		12  I/Os currently in progress
-		13  time spent doing I/Os (ms)
-		14  weighted time spent doing I/Os (ms)
-		==  ===================================
+		 1 - major number
+		 2 - minor mumber
+		 3 - device name
+		 4 - reads completed successfully
+		 5 - reads merged
+		 6 - sectors read
+		 7 - time spent reading (ms)
+		 8 - writes completed
+		 9 - writes merged
+		10 - sectors written
+		11 - time spent writing (ms)
+		12 - I/Os currently in progress
+		13 - time spent doing I/Os (ms)
+		14 - weighted time spent doing I/Os (ms)

 		Kernel 4.18+ appends four more fields for discard
 		tracking putting the total at 18:

-		==  ===================================
-		15  discards completed successfully
-		16  discards merged
-		17  sectors discarded
-		18  time spent discarding
-		==  ===================================
-
-		Kernel 5.5+ appends two more fields for flush requests:
-
-		==  =====================================
-		19  flush requests completed successfully
-		20  time spent flushing
-		==  =====================================
+		15 - discards completed successfully
+		16 - discards merged
+		17 - sectors discarded
+		18 - time spent discarding

 		For more details refer to Documentation/admin-guide/iostats.rst
--- a/Documentation/ABI/testing/procfs-smaps_rollup
+++ b/Documentation/ABI/testing/procfs-smaps_rollup
@@ -11,31 +11,31 @@ Description:
 		Additionally, the fields Pss_Anon, Pss_File and Pss_Shmem
 		are not present in /proc/pid/smaps.  These fields represent
 		the sum of the Pss field of each type (anon, file, shmem).
-		For more details, see Documentation/filesystems/proc.rst
+		For more details, see Documentation/filesystems/proc.txt
 		and the procfs man page.

-		Typical output looks like this::
+		Typical output looks like this:

-			00100000-ff709000 ---p 00000000 00:00 0		 [rollup]
-			Size:               1192 kB
-			KernelPageSize:        4 kB
-			MMUPageSize:           4 kB
-			Rss:		     884 kB
-			Pss:		     385 kB
-			Pss_Anon:	     301 kB
-			Pss_File:	      80 kB
-			Pss_Shmem:	       4 kB
-			Shared_Clean:	     696 kB
-			Shared_Dirty:	       0 kB
-			Private_Clean:	     120 kB
-			Private_Dirty:	      68 kB
-			Referenced:	     884 kB
-			Anonymous:	      68 kB
-			LazyFree:	       0 kB
-			AnonHugePages:	       0 kB
-			ShmemPmdMapped:	       0 kB
-			Shared_Hugetlb:	       0 kB
-			Private_Hugetlb:       0 kB
-			Swap:		       0 kB
-			SwapPss:	       0 kB
-			Locked:		     385 kB
+		00100000-ff709000 ---p 00000000 00:00 0		 [rollup]
+		Size:               1192 kB
+		KernelPageSize:        4 kB
+		MMUPageSize:           4 kB
+		Rss:		     884 kB
+		Pss:		     385 kB
+		Pss_Anon:	     301 kB
+		Pss_File:	      80 kB
+		Pss_Shmem:	       4 kB
+		Shared_Clean:	     696 kB
+		Shared_Dirty:	       0 kB
+		Private_Clean:	     120 kB
+		Private_Dirty:	      68 kB
+		Referenced:	     884 kB
+		Anonymous:	      68 kB
+		LazyFree:	       0 kB
+		AnonHugePages:	       0 kB
+		ShmemPmdMapped:	       0 kB
+		Shared_Hugetlb:	       0 kB
+		Private_Hugetlb:       0 kB
+		Swap:		       0 kB
+		SwapPss:	       0 kB
+		Locked:		     385 kB
--- a/Documentation/ABI/testing/pstore
+++ b/Documentation/ABI/testing/pstore
@@ -9,25 +9,25 @@ Description:	Generic interface to platform dependent persistent storage.
 		provide a generic interface to show records captured in
 		the dying moments.  In the case of a panic the last part
 		of the console log is captured, but other interesting
-		data can also be saved::
+		data can also be saved.

-		    # mount -t pstore -o kmsg_bytes=8000 - /sys/fs/pstore
+		# mount -t pstore -o kmsg_bytes=8000 - /sys/fs/pstore

-		    $ ls -l /sys/fs/pstore/
-		    total 0
-		    -r--r--r-- 1 root root 7896 Nov 30 15:38 dmesg-erst-1
+		$ ls -l /sys/fs/pstore/
+		total 0
+		-r--r--r-- 1 root root 7896 Nov 30 15:38 dmesg-erst-1

 		Different users of this interface will result in different
 		filename prefixes.  Currently two are defined:

-		- "dmesg" - saved console log
-		- "mce"   - architecture dependent data from fatal h/w error
+		"dmesg"	- saved console log
+		"mce"	- architecture dependent data from fatal h/w error

 		Once the information in a file has been read, removing
 		the file will signal to the underlying persistent storage
-		device that it can reclaim the space for later re-use::
+		device that it can reclaim the space for later re-use.

-		    $ rm /sys/fs/pstore/dmesg-erst-1
+		$ rm /sys/fs/pstore/dmesg-erst-1

 		The expectation is that all files in /sys/fs/pstore/
 		will be saved elsewhere and erased from persistent store
@@ -44,3 +44,4 @@ Description:	Generic interface to platform dependent persistent storage.
 		backends are available, the preferred backend may be
 		set by passing the pstore.backend= argument to the kernel at
 		boot time.
+
--- a/Documentation/ABI/testing/rtc-cdev
+++ b/Documentation/ABI/testing/rtc-cdev
@@ -33,14 +33,6 @@ Description:
 		  Requires a separate RTC_PIE_ON call to enable the periodic
 		  interrupts.

-		* RTC_VL_READ: Read the voltage inputs status of the RTC when
-		  supported. The value is a bit field of RTC_VL_*, giving the
-		  status of the main and backup voltages.
-
-		* RTC_VL_CLEAR: Clear the voltage status of the RTC. Some RTCs
-		  need user interaction when the backup power provider is
-		  replaced or charged to be able to clear the status.
-
 		The ioctl() calls supported by the older /dev/rtc interface are
 		also supported by the newer RTC class framework. However,
 		because the chips and systems are not standardized, some PC/AT
--- a/Documentation/ABI/testing/sysfs-block
+++ b/Documentation/ABI/testing/sysfs-block
@@ -4,27 +4,17 @@ Contact:	Jerome Marchand <jmarchan@redhat.com>
 Description:
 		The /sys/block/<disk>/stat files displays the I/O
 		statistics of disk <disk>. They contain 11 fields:
-
-		==  ==============================================
-		 1  reads completed successfully
-		 2  reads merged
-		 3  sectors read
-		 4  time spent reading (ms)
-		 5  writes completed
-		 6  writes merged
-		 7  sectors written
-		 8  time spent writing (ms)
-		 9  I/Os currently in progress
-		10  time spent doing I/Os (ms)
-		11  weighted time spent doing I/Os (ms)
-		12  discards completed
-		13  discards merged
-		14  sectors discarded
-		15  time spent discarding (ms)
-		16  flush requests completed
-		17  time spent flushing (ms)
-		==  ==============================================
-
+		 1 - reads completed successfully
+		 2 - reads merged
+		 3 - sectors read
+		 4 - time spent reading (ms)
+		 5 - writes completed
+		 6 - writes merged
+		 7 - sectors written
+		 8 - time spent writing (ms)
+		 9 - I/Os currently in progress
+		10 - time spent doing I/Os (ms)
+		11 - weighted time spent doing I/Os (ms)
 		For more details refer Documentation/admin-guide/iostats.rst


@@ -277,24 +267,6 @@ Description:
 		device ("host-aware" or "host-managed" zone model). For regular
 		block devices, the value is always 0.

-What:		/sys/block/<disk>/queue/max_active_zones
-Date:		July 2020
-Contact:	Niklas Cassel <niklas.cassel@wdc.com>
-Description:
-		For zoned block devices (zoned attribute indicating
-		"host-managed" or "host-aware"), the sum of zones belonging to
-		any of the zone states: EXPLICIT OPEN, IMPLICIT OPEN or CLOSED,
-		is limited by this value. If this value is 0, there is no limit.
-
-What:		/sys/block/<disk>/queue/max_open_zones
-Date:		July 2020
-Contact:	Niklas Cassel <niklas.cassel@wdc.com>
-Description:
-		For zoned block devices (zoned attribute indicating
-		"host-managed" or "host-aware"), the sum of zones belonging to
-		any of the zone states: EXPLICIT OPEN or IMPLICIT OPEN,
-		is limited by this value. If this value is 0, there is no limit.
-
 What:		/sys/block/<disk>/queue/chunk_sectors
 Date:		September 2016
 Contact:	Hannes Reinecke <hare@suse.com>
--- a/Documentation/ABI/testing/sysfs-block-device
+++ b/Documentation/ABI/testing/sysfs-block-device
@@ -8,13 +8,11 @@ Description:

 		It has the following valid values:

-		==	========================================================
 		0	OFF - the LED is not activated on activity
 		1	BLINK_ON - the LED blinks on every 10ms when activity is
 			detected.
 		2	BLINK_OFF - the LED is on when idle, and blinks off
 			every 10ms when activity is detected.
-		==	========================================================

 		Note that the user must turn sw_activity OFF it they wish to
 		control the activity LED via the em_message file.
--- a/Documentation/ABI/testing/sysfs-block-rnbd
+++ b/Documentation/ABI/testing/sysfs-block-rnbd
@@ -1,46 +0,0 @@
-What:		/sys/block/rnbd<N>/rnbd/unmap_device
-Date:		Feb 2020
-KernelVersion:	5.7
-Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>
-Description:	To unmap a volume, "normal" or "force" has to be written to:
-		/sys/block/rnbd<N>/rnbd/unmap_device
-
-		When "normal" is used, the operation will fail with EBUSY if any process
-		is using the device.  When "force" is used, the device is also unmapped
-		when device is in use.  All I/Os that are in progress will fail.
-
-		Example::
-
-		  # echo "normal" > /sys/block/rnbd0/rnbd/unmap_device
-
-What:		/sys/block/rnbd<N>/rnbd/state
-Date:		Feb 2020
-KernelVersion:	5.7
-Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>
-Description:	The file contains the current state of the block device. The state file
-		returns "open" when the device is successfully mapped from the server
-		and accepting I/O requests. When the connection to the server gets
-		disconnected in case of an error (e.g. link failure), the state file
-		returns "closed" and all I/O requests submitted to it will fail with -EIO.
-
-What:		/sys/block/rnbd<N>/rnbd/session
-Date:		Feb 2020
-KernelVersion:	5.7
-Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>
-Description:	RNBD uses RTRS session to transport the data between client and
-		server.  The entry "session" contains the name of the session, that
-		was used to establish the RTRS session.  It's the same name that
-		was passed as server parameter to the map_device entry.
-
-What:		/sys/block/rnbd<N>/rnbd/mapping_path
-Date:		Feb 2020
-KernelVersion:	5.7
-Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>
-Description:	Contains the path that was passed as "device_path" to the map_device
-		operation.
-
-What:		/sys/block/rnbd<N>/rnbd/access_mode
-Date:		Feb 2020
-KernelVersion:	5.7
-Contact:	Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>
-Description:	Contains the device access mode: ro, rw or migration.
--- a/Documentation/ABI/testing/sysfs-bus-acpi
+++ b/Documentation/ABI/testing/sysfs-bus-acpi
@@ -5,7 +5,6 @@ Description:
 		This attribute indicates the full path of ACPI namespace
 		object associated with the device object.  For example,
 		\_SB_.PCI0.
-
 		This file is not present for device objects representing
 		fixed ACPI hardware features (like power and sleep
 		buttons).
@@ -68,16 +67,14 @@ Description:
 		The return value is a decimal integer representing the device's
 		status bitmap:

-		===========  ==================================================
-		Bit [0]      Set if the device is present.
-		Bit [1]      Set if the device is enabled and decoding its
-		             resources.
-		Bit [2]      Set if the device should be shown in the UI.
-		Bit [3]      Set if the device is functioning properly (cleared
-			     if device failed its diagnostics).
-		Bit [4]      Set if the battery is present.
-		Bits [31:5]  Reserved (must be cleared)
-		===========  ==================================================
+		Bit [0] –  Set if the device is present.
+		Bit [1] –  Set if the device is enabled and decoding its
+		           resources.
+		Bit [2] –  Set if the device should be shown in the UI.
+		Bit [3] –  Set if the device is functioning properly (cleared if
+		           device failed its diagnostics).
+		Bit [4] –  Set if the battery is present.
+		Bits [31:5] –  Reserved (must be cleared)

 		If bit [0] is clear, then bit 1 must also be clear (a device
 		that is not present cannot be enabled).
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-cti
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-cti
@@ -1,241 +0,0 @@
-What:		/sys/bus/coresight/devices/<cti-name>/enable
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Enable/Disable the CTI hardware.
-
-What:		/sys/bus/coresight/devices/<cti-name>/powered
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Indicate if the CTI hardware is powered.
-
-What:		/sys/bus/coresight/devices/<cti-name>/ctmid
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Display the associated CTM ID
-
-What:		/sys/bus/coresight/devices/<cti-name>/nr_trigger_cons
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Number of devices connected to triggers on this CTI
-
-What:		/sys/bus/coresight/devices/<cti-name>/triggers<N>/name
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Name of connected device <N>
-
-What:		/sys/bus/coresight/devices/<cti-name>/triggers<N>/in_signals
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Input trigger signals from connected device <N>
-
-What:		/sys/bus/coresight/devices/<cti-name>/triggers<N>/in_types
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Functional types for the input trigger signals
-		from connected device <N>
-
-What:		/sys/bus/coresight/devices/<cti-name>/triggers<N>/out_signals
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Output trigger signals to connected device <N>
-
-What:		/sys/bus/coresight/devices/<cti-name>/triggers<N>/out_types
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Functional types for the output trigger signals
-		to connected device <N>
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/inout_sel
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Select the index for inen and outen registers.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/inen
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Read or write the CTIINEN register selected by inout_sel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/outen
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Read or write the CTIOUTEN register selected by inout_sel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/gate
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Read or write CTIGATE register.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/asicctl
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Read or write ASICCTL register.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/intack
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Write the INTACK register.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/appset
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Set CTIAPPSET register to activate channel. Read back to
-		determine current value of register.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/appclear
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Write APPCLEAR register to deactivate channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/apppulse
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Write APPPULSE to pulse a channel active for one clock
-		cycle.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/chinstatus
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Read current status of channel inputs.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/choutstatus
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) read current status of channel outputs.
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/triginstatus
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) read current status of input trigger signals
-
-What:		/sys/bus/coresight/devices/<cti-name>/regs/trigoutstatus
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) read current status of output trigger signals.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/trigin_attach
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Attach a CTI input trigger to a CTM channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/trigin_detach
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Detach a CTI input trigger from a CTM channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/trigout_attach
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Attach a CTI output trigger to a CTM channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/trigout_detach
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Detach a CTI output trigger from a CTM channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_gate_enable
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Enable CTIGATE for single channel (Write) or list enabled
-		channels through the gate (R).
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_gate_disable
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Disable CTIGATE for single channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_set
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Activate a single channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_clear
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Deactivate a single channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_pulse
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Pulse a single channel - activate for a single clock cycle.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/trigout_filtered
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) List of output triggers filtered across all connections.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/trig_filter_enable
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Enable or disable trigger output signal filtering.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_inuse
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) show channels with at least one attached trigger signal.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_free
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) show channels with no attached trigger signals.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_xtrigs_sel
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(RW) Write channel number to select a channel to view, read to
-		see selected channel number.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_xtrigs_in
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Read to see input triggers connected to selected view
-		channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_xtrigs_out
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Read) Read to see output triggers connected to selected view
-		channel.
-
-What:		/sys/bus/coresight/devices/<cti-name>/channels/chan_xtrigs_reset
-Date:		March 2020
-KernelVersion	5.7
-Contact:	Mike Leach or Mathieu Poirier
-Description:	(Write) Clear all channel / trigger programming.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10
@@ -4,10 +4,7 @@ KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description:	(RW) Add/remove a sink from a trace path.  There can be multiple
 		source for a single sink.
-
-		ex::
-
-		  echo 1 > /sys/bus/coresight/devices/20010000.etb/enable_sink
+		ex: echo 1 > /sys/bus/coresight/devices/20010000.etb/enable_sink

 What:		/sys/bus/coresight/devices/<memory_map>.etb/trigger_cntr
 Date:		November 2014
@@ -23,21 +20,21 @@ What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/rdp
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Defines the depth, in words, of the trace RAM in powers of
+Description:	(R) Defines the depth, in words, of the trace RAM in powers of
 		2.  The value is read directly from HW register RDP, 0x004.

 What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/sts
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the ETB status register.  The value
+Description:	(R) Shows the value held by the ETB status register.  The value
 		is read directly from HW register STS, 0x00C.

 What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/rrp
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the ETB RAM Read Pointer register
+Description:	(R) Shows the value held by the ETB RAM Read Pointer register
 		that is used to read entries from the Trace RAM over the APB
 		interface.  The value is read directly from HW register RRP,
 		0x014.
@@ -46,7 +43,7 @@ What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/rwp
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the ETB RAM Write Pointer register
+Description:	(R) Shows the value held by the ETB RAM Write Pointer register
 		that is used to sets the write pointer to write entries from
 		the CoreSight bus into the Trace RAM. The value is read directly
 		from HW register RWP, 0x018.
@@ -55,21 +52,21 @@ What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/trg
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Similar to "trigger_cntr" above except that this value is
+Description:	(R) Similar to "trigger_cntr" above except that this value is
 		read directly from HW register TRG, 0x01C.

 What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/ctl
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the ETB Control register. The value
+Description:	(R) Shows the value held by the ETB Control register. The value
 		is read directly from HW register CTL, 0x020.

 What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/ffsr
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the ETB Formatter and Flush Status
+Description:	(R) Shows the value held by the ETB Formatter and Flush Status
 		register.  The value is read directly from HW register FFSR,
 		0x300.

@@ -77,6 +74,6 @@ What:		/sys/bus/coresight/devices/<memory_map>.etb/mgmt/ffcr
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the ETB Formatter and Flush Control
+Description:	(R) Shows the value held by the ETB Formatter and Flush Control
 		register.  The value is read directly from HW register FFCR,
 		0x304.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x
@@ -146,28 +146,28 @@ What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/nr_addr_cmp
 Date:		November 2014
 KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(Read) Provides the number of address comparators pairs accessible
+Description: 	(R) Provides the number of address comparators pairs accessible
 		on a trace unit, as specified by bit 3:0 of register ETMCCR.

 What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/nr_cntr
 Date:		November 2014
 KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(Read) Provides the number of counters accessible on a trace unit,
+Description: 	(R) Provides the number of counters accessible on a trace unit,
 		as specified by bit 15:13 of register ETMCCR.

 What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/nr_ctxid_cmp
 Date:		November 2014
 KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(Read) Provides the number of context ID comparator available on a
+Description: 	(R) Provides the number of context ID comparator available on a
 		trace unit, as specified by bit 25:24 of register ETMCCR.

 What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/reset
 Date:		November 2014
 KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(Write) Cancels all configuration on a trace unit and set it back
+Description: 	(W) Cancels all configuration on a trace unit and set it back
 		to its boot configuration.

 What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/seq_12_event
@@ -216,7 +216,7 @@ What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/curr_seq_state
 Date:		November 2014
 KernelVersion:	3.19
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(Read) Holds the current state of the sequencer.
+Description: 	(R) Holds the current state of the sequencer.

 What:		/sys/bus/coresight/devices/<memory_map>.[etm|ptm]/sync_freq
 Date:		November 2014
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-etm4x
@@ -1,4 +1,4 @@
-What:		/sys/bus/coresight/devices/etm<N>/enable_source
+What:		/sys/bus/coresight/devices/<memory_map>.etm/enable_source
 Date:		April 2015
 KernelVersion:  4.01
 Contact:        Mathieu Poirier <mathieu.poirier@linaro.org>
@@ -8,82 +8,82 @@ Description:	(RW) Enable/disable tracing on this specific trace entiry.
 		of coresight components linking the source to the sink is
 		configured and managed automatically by the coresight framework.

-What:		/sys/bus/coresight/devices/etm<N>/cpu
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cpu
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) The CPU this tracing entity is associated with.
+Description:	(R) The CPU this tracing entity is associated with.

-What:		/sys/bus/coresight/devices/etm<N>/nr_pe_cmp
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_pe_cmp
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of PE comparator inputs that are
+Description:	(R) Indicates the number of PE comparator inputs that are
 		available for tracing.

-What:		/sys/bus/coresight/devices/etm<N>/nr_addr_cmp
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_addr_cmp
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of address comparator pairs that are
+Description:	(R) Indicates the number of address comparator pairs that are
 		available for tracing.

-What:		/sys/bus/coresight/devices/etm<N>/nr_cntr
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_cntr
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of counters that are available for
+Description:	(R) Indicates the number of counters that are available for
 		tracing.

-What:		/sys/bus/coresight/devices/etm<N>/nr_ext_inp
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_ext_inp
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates how many external inputs are implemented.
+Description:	(R) Indicates how many external inputs are implemented.

-What:		/sys/bus/coresight/devices/etm<N>/numcidc
+What:		/sys/bus/coresight/devices/<memory_map>.etm/numcidc
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of Context ID comparators that are
+Description:	(R) Indicates the number of Context ID comparators that are
 		available for tracing.

-What:		/sys/bus/coresight/devices/etm<N>/numvmidc
+What:		/sys/bus/coresight/devices/<memory_map>.etm/numvmidc
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of VMID comparators that are available
+Description:	(R) Indicates the number of VMID comparators that are available
 		for tracing.

-What:		/sys/bus/coresight/devices/etm<N>/nrseqstate
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nrseqstate
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of sequencer states that are
+Description:	(R) Indicates the number of sequencer states that are
 		implemented.

-What:		/sys/bus/coresight/devices/etm<N>/nr_resource
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_resource
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of resource selection pairs that are
+Description:	(R) Indicates the number of resource selection pairs that are
 		available for tracing.

-What:		/sys/bus/coresight/devices/etm<N>/nr_ss_cmp
+What:		/sys/bus/coresight/devices/<memory_map>.etm/nr_ss_cmp
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the number of single-shot comparator controls that
+Description:	(R) Indicates the number of single-shot comparator controls that
 		are available for tracing.

-What:		/sys/bus/coresight/devices/etm<N>/reset
+What:		/sys/bus/coresight/devices/<memory_map>.etm/reset
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description: 	(Write) Cancels all configuration on a trace unit and set it back
+Description: 	(W) Cancels all configuration on a trace unit and set it back
 		to its boot configuration.

-What:		/sys/bus/coresight/devices/etm<N>/mode
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mode
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
@@ -91,420 +91,373 @@ Description: 	(RW) Controls various modes supported by this ETM, for example
 		P0 instruction tracing, branch broadcast, cycle counting and
 		context ID tracing.

-What:		/sys/bus/coresight/devices/etm<N>/pe
+What:		/sys/bus/coresight/devices/<memory_map>.etm/pe
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls which PE to trace.

-What:		/sys/bus/coresight/devices/etm<N>/event
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls the tracing of arbitrary events from bank 0 to 3.

-What:		/sys/bus/coresight/devices/etm<N>/event_instren
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event_instren
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls the behavior of the events in bank 0 to 3.

-What:		/sys/bus/coresight/devices/etm<N>/event_ts
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event_ts
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls the insertion of global timestamps in the trace
 		streams.

-What:		/sys/bus/coresight/devices/etm<N>/syncfreq
+What:		/sys/bus/coresight/devices/<memory_map>.etm/syncfreq
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls how often trace synchronization requests occur.

-What:		/sys/bus/coresight/devices/etm<N>/cyc_threshold
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cyc_threshold
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Sets the threshold value for cycle counting.

-What:		/sys/bus/coresight/devices/etm<N>/bb_ctrl
+What:		/sys/bus/coresight/devices/<memory_map>.etm/bb_ctrl
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls which regions in the memory map are enabled to
 		use branch broadcasting.

-What:		/sys/bus/coresight/devices/etm<N>/event_vinst
+What:		/sys/bus/coresight/devices/<memory_map>.etm/event_vinst
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls instruction trace filtering.

-What:		/sys/bus/coresight/devices/etm<N>/s_exlevel_vinst
+What:		/sys/bus/coresight/devices/<memory_map>.etm/s_exlevel_vinst
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) In Secure state, each bit controls whether instruction
 		tracing is enabled for the corresponding exception level.

-What:		/sys/bus/coresight/devices/etm<N>/ns_exlevel_vinst
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ns_exlevel_vinst
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) In non-secure state, each bit controls whether instruction
 		tracing is enabled for the corresponding exception level.

-What:		/sys/bus/coresight/devices/etm<N>/addr_idx
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_idx
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Select which address comparator or pair (of comparators) to
 		work with.

-What:		/sys/bus/coresight/devices/etm<N>/addr_instdatatype
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_instdatatype
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls what type of comparison the trace unit performs.

-What:		/sys/bus/coresight/devices/etm<N>/addr_single
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_single
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Used to setup single address comparator values.

-What:		/sys/bus/coresight/devices/etm<N>/addr_range
+What:		/sys/bus/coresight/devices/<memory_map>.etm/addr_range
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Used to setup address range comparator values.

-What:		/sys/bus/coresight/devices/etm<N>/seq_idx
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_idx
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Select which sequensor.

-What:		/sys/bus/coresight/devices/etm<N>/seq_state
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_state
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Use this to set, or read, the sequencer state.

-What:		/sys/bus/coresight/devices/etm<N>/seq_event
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_event
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Moves the sequencer state to a specific state.

-What:		/sys/bus/coresight/devices/etm<N>/seq_reset_event
+What:		/sys/bus/coresight/devices/<memory_map>.etm/seq_reset_event
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Moves the sequencer to state 0 when a programmed event
 		occurs.

-What:		/sys/bus/coresight/devices/etm<N>/cntr_idx
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_idx
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Select which counter unit to work with.

-What:		/sys/bus/coresight/devices/etm<N>/cntrldvr
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntrldvr
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) This sets or returns the reload count value of the
 		specific counter.

-What:		/sys/bus/coresight/devices/etm<N>/cntr_val
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_val
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) This sets or returns the current count value of the
                specific counter.

-What:		/sys/bus/coresight/devices/etm<N>/cntr_ctrl
+What:		/sys/bus/coresight/devices/<memory_map>.etm/cntr_ctrl
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls the operation of the selected counter.

-What:		/sys/bus/coresight/devices/etm<N>/res_idx
+What:		/sys/bus/coresight/devices/<memory_map>.etm/res_idx
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Select which resource selection unit to work with.

-What:		/sys/bus/coresight/devices/etm<N>/res_ctrl
+What:		/sys/bus/coresight/devices/<memory_map>.etm/res_ctrl
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description: 	(RW) Controls the selection of the resources in the trace unit.

-What:		/sys/bus/coresight/devices/etm<N>/ctxid_idx
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_idx
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description:	(RW) Select which context ID comparator to work with.

-What:		/sys/bus/coresight/devices/etm<N>/ctxid_pid
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_pid
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description:	(RW) Get/Set the context ID comparator value to trigger on.

-What:		/sys/bus/coresight/devices/etm<N>/ctxid_masks
+What:		/sys/bus/coresight/devices/<memory_map>.etm/ctxid_masks
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description:	(RW) Mask for all 8 context ID comparator value
 		registers (if implemented).

-What:		/sys/bus/coresight/devices/etm<N>/vmid_idx
+What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_idx
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description:	(RW) Select which virtual machine ID comparator to work with.

-What:		/sys/bus/coresight/devices/etm<N>/vmid_val
+What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_val
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description:	(RW) Get/Set the virtual machine ID comparator value to
 		trigger on.

-What:		/sys/bus/coresight/devices/etm<N>/vmid_masks
+What:		/sys/bus/coresight/devices/<memory_map>.etm/vmid_masks
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
 Description:	(RW) Mask for all 8 virtual machine ID comparator value
 		registers (if implemented).

-What:		/sys/bus/coresight/devices/etm<N>/addr_exlevel_s_ns
-Date:		December 2019
-KernelVersion:	5.5
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Set the Exception Level matching bits for secure and
-		non-secure exception levels.
-
-What:		/sys/bus/coresight/devices/etm<N>/vinst_pe_cmp_start_stop
-Date:		December 2019
-KernelVersion:	5.5
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Access the start stop control register for PE input
-		comparators.
-
-What:		/sys/bus/coresight/devices/etm<N>/addr_cmp_view
-Date:		December 2019
-KernelVersion:	5.5
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the current settings for the selected address
-		comparator.
-
-What:		/sys/bus/coresight/devices/etm<N>/sshot_idx
-Date:		December 2019
-KernelVersion:	5.5
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Select the single shot control register to access.
-
-What:		/sys/bus/coresight/devices/etm<N>/sshot_ctrl
-Date:		December 2019
-KernelVersion:	5.5
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Access the selected single shot control register.
-
-What:		/sys/bus/coresight/devices/etm<N>/sshot_status
-Date:		December 2019
-KernelVersion:	5.5
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the current value of the selected single shot
-		status register.
-
-What:		/sys/bus/coresight/devices/etm<N>/sshot_pe_ctrl
-Date:		December 2019
-KernelVersion:	5.5
-Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(RW) Access the selected single show PE comparator control
-		register.
-
-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcoslsr
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcoslsr
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the OS Lock Status Register (0x304).
+Description:	(R) Print the content of the OS Lock Status Register (0x304).
 		The value it taken directly  from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcpdcr
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpdcr
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Power Down Control Register
+Description:	(R) Print the content of the Power Down Control Register
 		(0x310).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcpdsr
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpdsr
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Power Down Status Register
+Description:	(R) Print the content of the Power Down Status Register
 		(0x314).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trclsr
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trclsr
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the SW Lock Status Register
+Description:	(R) Print the content of the SW Lock Status Register
 		(0xFB4).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcauthstatus
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcauthstatus
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Authentication Status Register
+Description:	(R) Print the content of the Authentication Status Register
 		(0xFB8).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcdevid
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcdevid
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Device ID Register
+Description:	(R) Print the content of the Device ID Register
 		(0xFC8).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcdevtype
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcdevtype
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Device Type Register
+Description:	(R) Print the content of the Device Type Register
 		(0xFCC).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcpidr0
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr0
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Peripheral ID0 Register
+Description:	(R) Print the content of the Peripheral ID0 Register
 		(0xFE0).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcpidr1
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr1
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Peripheral ID1 Register
+Description:	(R) Print the content of the Peripheral ID1 Register
 		(0xFE4).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcpidr2
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr2
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Peripheral ID2 Register
+Description:	(R) Print the content of the Peripheral ID2 Register
 		(0xFE8).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcpidr3
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcpidr3
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the Peripheral ID3 Register
+Description:	(R) Print the content of the Peripheral ID3 Register
 		(0xFEC).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trcconfig
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trcconfig
 Date:		February 2016
 KernelVersion:	4.07
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the trace configuration register
+Description:	(R) Print the content of the trace configuration register
 		(0x010) as currently set by SW.

-What:		/sys/bus/coresight/devices/etm<N>/mgmt/trctraceid
+What:		/sys/bus/coresight/devices/<memory_map>.etm/mgmt/trctraceid
 Date:		February 2016
 KernelVersion:	4.07
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Print the content of the trace ID register (0x040).
+Description:	(R) Print the content of the trace ID register (0x040).

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr0
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr0
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the tracing capabilities of the trace unit (0x1E0).
+Description:	(R) Returns the tracing capabilities of the trace unit (0x1E0).
 		The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr1
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr1
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the tracing capabilities of the trace unit (0x1E4).
+Description:	(R) Returns the tracing capabilities of the trace unit (0x1E4).
 		The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr2
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr2
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the maximum size of the data value, data address,
+Description:	(R) Returns the maximum size of the data value, data address,
 		VMID, context ID and instuction address in the trace unit
 		(0x1E8).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr3
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr3
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the value associated with various resources
+Description:	(R) Returns the value associated with various resources
 		available to the trace unit.  See the Trace Macrocell
 		architecture specification for more details (0x1E8).
 		The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr4
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr4
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns how many resources the trace unit supports (0x1F0).
+Description:	(R) Returns how many resources the trace unit supports (0x1F0).
 		The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr5
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr5
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns how many resources the trace unit supports (0x1F4).
+Description:	(R) Returns how many resources the trace unit supports (0x1F4).
 		The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr8
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr8
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the maximum speculation depth of the instruction
+Description:	(R) Returns the maximum speculation depth of the instruction
 		trace stream. (0x180).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr9
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr9
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the number of P0 right-hand keys that the trace unit
+Description:	(R) Returns the number of P0 right-hand keys that the trace unit
 		can use (0x184).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr10
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr10
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the number of P1 right-hand keys that the trace unit
+Description:	(R) Returns the number of P1 right-hand keys that the trace unit
 		can use (0x188).  The value is taken directly from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr11
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr11
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the number of special P1 right-hand keys that the
+Description:	(R) Returns the number of special P1 right-hand keys that the
 		trace unit can use (0x18C).  The value is taken directly from
 		the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr12
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr12
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the number of conditional P1 right-hand keys that
+Description:	(R) Returns the number of conditional P1 right-hand keys that
 		the trace unit can use (0x190).  The value is taken directly
 		from the HW.

-What:		/sys/bus/coresight/devices/etm<N>/trcidr/trcidr13
+What:		/sys/bus/coresight/devices/<memory_map>.etm/trcidr/trcidr13
 Date:		April 2015
 KernelVersion:	4.01
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Returns the number of special conditional P1 right-hand keys
+Description:	(R) Returns the number of special conditional P1 right-hand keys
 		that the trace unit can use (0x194).  The value is taken
 		directly from the HW.
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-stm
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-stm
@@ -42,7 +42,7 @@ What:		/sys/bus/coresight/devices/<memory_map>.stm/status
 Date:		April 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) List various control and status registers.  The specific
+Description:	(R) List various control and status registers.  The specific
 		layout and content is driver specific.

 What:		/sys/bus/coresight/devices/<memory_map>.stm/traceid
--- a/Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc
+++ b/Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc
@@ -11,21 +11,21 @@ What:           /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rsz
 Date:           March 2016
 KernelVersion:  4.7
 Contact:        Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:    (Read) Defines the size, in 32-bit words, of the local RAM buffer.
+Description:    (R) Defines the size, in 32-bit words, of the local RAM buffer.
                The value is read directly from HW register RSZ, 0x004.

 What:           /sys/bus/coresight/devices/<memory_map>.tmc/mgmt/sts
 Date:           March 2016
 KernelVersion:  4.7
 Contact:        Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the TMC status register.  The value
+Description:	(R) Shows the value held by the TMC status register.  The value
                is read directly from HW register STS, 0x00C.

 What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rrp
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the TMC RAM Read Pointer register
+Description:	(R) Shows the value held by the TMC RAM Read Pointer register
 		that is used to read entries from the Trace RAM over the APB
 		interface.  The value is read directly from HW register RRP,
 		0x014.
@@ -34,7 +34,7 @@ What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/rwp
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the TMC RAM Write Pointer register
+Description:	(R) Shows the value held by the TMC RAM Write Pointer register
 		that is used to sets the write pointer to write entries from
 		the CoreSight bus into the Trace RAM. The value is read directly
 		from HW register RWP, 0x018.
@@ -43,21 +43,21 @@ What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/trg
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Similar to "trigger_cntr" above except that this value is
+Description:	(R) Similar to "trigger_cntr" above except that this value is
 		read directly from HW register TRG, 0x01C.

 What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ctl
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the TMC Control register. The value
+Description:	(R) Shows the value held by the TMC Control register. The value
 		is read directly from HW register CTL, 0x020.

 What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ffsr
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the TMC Formatter and Flush Status
+Description:	(R) Shows the value held by the TMC Formatter and Flush Status
 		register.  The value is read directly from HW register FFSR,
 		0x300.

@@ -65,7 +65,7 @@ What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/ffcr
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the TMC Formatter and Flush Control
+Description:	(R) Shows the value held by the TMC Formatter and Flush Control
 		register.  The value is read directly from HW register FFCR,
 		0x304.

@@ -73,7 +73,7 @@ What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/mode
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Shows the value held by the TMC Mode register, which
+Description:	(R) Shows the value held by the TMC Mode register, which
 		indicate the mode the device has been configured to enact.  The
 		The value is read directly from the MODE register, 0x028.

@@ -81,7 +81,7 @@ What:		/sys/bus/coresight/devices/<memory_map>.tmc/mgmt/devid
 Date:		March 2016
 KernelVersion:	4.7
 Contact:	Mathieu Poirier <mathieu.poirier@linaro.org>
-Description:	(Read) Indicates the capabilities of the Coresight TMC.
+Description:	(R) Indicates the capabilities of the Coresight TMC.
 		The value is read directly from the DEVID register, 0xFC8,

 What:		/sys/bus/coresight/devices/<memory_map>.tmc/buffer_size
--- a/Show More
+++ b/Show More