Commit b51594df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull documentation fixes from Jonathan Corbet:
 "A handful of documentation fixes for 5.9"

* tag 'docs-5.9-3' of git://git.lwn.net/linux:
  Documentation: laptops: thinkpad-acpi: fix underline length build warning
  Documentation: fix typo for abituguru documentation
  docs: Fix function name trailing double-()s
  devices.txt: fix typo of "ubd" as "udb"
  Documentation: add riscv entry in list of existing profiles
  MAINTAINERS: mention documentation maintainer entry profile
  Fpga: Documentation: Replace deprecated :c:func: Usage
  IIO: Documentation: Replace deprecated :c:func: Usage
  Documentation/locking/locktypes: fix local_locks documentation
parents 59815d6d 92001bc0

Documentation/RCU/lockdep.rst

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ checking of rcu_dereference() primitives: 
		is invoked by both RCU-sched readers and updaters.

	srcu_dereference_check(p, c):

		Use explicit check expression "c" along with

		srcu_read_lock_held()().  This is useful in code that

		srcu_read_lock_held().  This is useful in code that

		is invoked by both SRCU readers and updaters.

	rcu_dereference_raw(p):

		Don't check.  (Use sparingly, if at all.)

Documentation/admin-guide/devices.txt

+1 −1
Original line number Diff line number Diff line
@@ -1662,7 +1662,7 @@ 


  98 block	User-mode virtual block device

		  0 = /dev/ubda		First user-mode block device

		 16 = /dev/udbb		Second user-mode block device

		 16 = /dev/ubdb		Second user-mode block device

		    ...



		Partitions are handled in the same way as for IDE

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+1 −1
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ on the feature, restricting the viewing angles. 




DYTC Lapmode sensor

------------------

-------------------



sysfs: dytc_lapmode

Documentation/driver-api/fpga/fpga-bridge.rst

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ API to implement a new FPGA bridge 


* struct :c:type:`fpga_bridge` — The FPGA Bridge structure

* struct :c:type:`fpga_bridge_ops` — Low level Bridge driver ops

* :c:func:`devm_fpga_bridge_create()` — Allocate and init a bridge struct

* :c:func:`fpga_bridge_register()` — Register a bridge

* :c:func:`fpga_bridge_unregister()` — Unregister a bridge

* devm_fpga_bridge_create() — Allocate and init a bridge struct

* fpga_bridge_register() — Register a bridge

* fpga_bridge_unregister() — Unregister a bridge



.. kernel-doc:: include/linux/fpga/fpga-bridge.h

   :functions: fpga_bridge

Documentation/driver-api/fpga/fpga-mgr.rst

+3 −3
Original line number Diff line number Diff line
@@ -104,9 +104,9 @@ API for implementing a new FPGA Manager driver 
* ``fpga_mgr_states`` —  Values for :c:member:`fpga_manager->state`.

* struct :c:type:`fpga_manager` —  the FPGA manager struct

* struct :c:type:`fpga_manager_ops` —  Low level FPGA manager driver ops

* :c:func:`devm_fpga_mgr_create` —  Allocate and init a manager struct

* :c:func:`fpga_mgr_register` —  Register an FPGA manager

* :c:func:`fpga_mgr_unregister` —  Unregister an FPGA manager

* devm_fpga_mgr_create() —  Allocate and init a manager struct

* fpga_mgr_register() —  Register an FPGA manager

* fpga_mgr_unregister() —  Unregister an FPGA manager



.. kernel-doc:: include/linux/fpga/fpga-mgr.h

   :functions: fpga_mgr_states

CRA Git | Maintained and supported by SUSTech CRA and CCSE