From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jun 2022 18:14:47 +0000 (-0700)
Subject: Merge tag 'docs-5.19-3' of git://git.lwn.net/linux
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/fe43c0188911885a70d0dd405f89ca4f1300e7db?hp=-c

Merge tag 'docs-5.19-3' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "A few documentation fixes for 5.19, including moving the new HTE docs
  to a more suitable location, adding loongarch to the features lists,
  and a couple of typo fixes"

* tag 'docs-5.19-3' of git://git.lwn.net/linux:
  docs: arm: tcm: Fix typo in description of TCM and MMU usage
  docs: Move the HTE documentation to driver-api/
  docs: usb: fix literal block marker in usbmon verification example
  Documentation/features: Update the arch support status files
---

fe43c0188911885a70d0dd405f89ca4f1300e7db
diff --combined MAINTAINERS
index 5453ad01514c,e5b7b78d62d3..9940d26c7de3
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3757,13 -3757,6 +3757,13 @@@ F:	include/linux/bpf_lsm.
  F:	kernel/bpf/bpf_lsm.c
  F:	security/bpf/
  
 +BPFTOOL
 +M:	Quentin Monnet <quentin@isovalent.com>
 +L:	bpf@vger.kernel.org
 +S:	Maintained
 +F:	kernel/bpf/disasm.*
 +F:	tools/bpf/bpftool/
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:	Michael Chan <michael.chan@broadcom.com>
  L:	netdev@vger.kernel.org
@@@ -9088,7 -9081,7 +9088,7 @@@ HTE SUBSYSTE
  M:	Dipen Patel <dipenp@nvidia.com>
  S:	Maintained
  F:	Documentation/devicetree/bindings/timestamp/
- F:	Documentation/hte/
+ F:	Documentation/driver-api/hte/
  F:	drivers/hte/
  F:	include/linux/hte.h
  
@@@ -11264,7 -11257,6 +11264,7 @@@ M:	Damien Le Moal <damien.lemoal@openso
  L:	linux-ide@vger.kernel.org
  S:	Maintained
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git
 +F:	Documentation/ABI/testing/sysfs-ata
  F:	Documentation/devicetree/bindings/ata/
  F:	drivers/ata/
  F:	include/linux/ata.h
@@@ -12704,6 -12696,7 +12704,6 @@@ L:	netdev@vger.kernel.or
  S:	Supported
  W:	http://www.mellanox.com
  Q:	https://patchwork.kernel.org/project/netdevbpf/list/
 -F:	drivers/net/ethernet/mellanox/mlx5/core/accel/*
  F:	drivers/net/ethernet/mellanox/mlx5/core/en_accel/*
  F:	drivers/net/ethernet/mellanox/mlx5/core/fpga/*
  F:	include/linux/mlx5/mlx5_ifc_fpga.h
@@@ -15831,14 -15824,6 +15831,14 @@@ S:	Maintaine
  F:	Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml
  F:	drivers/iio/chemical/pms7003.c
  
 +PLATFORM FEATURE INFRASTRUCTURE
 +M:	Juergen Gross <jgross@suse.com>
 +S:	Maintained
 +F:	arch/*/include/asm/platform-feature.h
 +F:	include/asm-generic/platform-feature.h
 +F:	include/linux/platform-feature.h
 +F:	kernel/platform-feature.c
 +
  PLDMFW LIBRARY
  M:	Jacob Keller <jacob.e.keller@intel.com>
  S:	Maintained