Commit 9c75b68b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.10-rc2' of...

Merge tag 'driver-core-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core and documentation fixes from Greg KH:
 "Here is one tiny debugfs change to fix up an API where the last user
  was successfully fixed up in 5.10-rc1 (so it couldn't be merged
  earlier), and a much larger Documentation/ABI/ update to the files so
  they can be automatically parsed by our tools.

  The Documentation/ABI/ updates are just formatting issues, small ones
  to bring the files into parsable format, and have been acked by
  numerous subsystem maintainers and the documentation maintainer. I
  figured it was good to get this into 5.10-rc2 to help wih the merge
  issues that would arise if these were to stick in linux-next until
  5.11-rc1.

  The debugfs change has been in linux-next for a long time, and the
  Documentation updates only for the last linux-next release"

* tag 'driver-core-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (40 commits)
  scripts: get_abi.pl: assume ReST format by default
  docs: ABI: sysfs-class-led-trigger-pattern: remove hw_pattern duplication
  docs: ABI: sysfs-class-backlight: unify ABI documentation
  docs: ABI: sysfs-c2port: remove a duplicated entry
  docs: ABI: sysfs-class-power: unify duplicated properties
  docs: ABI: unify /sys/class/leds/<led>/brightness documentation
  docs: ABI: stable: remove a duplicated documentation
  docs: ABI: change read/write attributes
  docs: ABI: cleanup several ABI documents
  docs: ABI: sysfs-bus-nvdimm: use the right format for ABI
  docs: ABI: vdso: use the right format for ABI
  docs: ABI: fix syntax to be parsed using ReST notation
  docs: ABI: convert testing/configfs-acpi to ReST
  docs: Kconfig/Makefile: add a check for broken ABI files
  docs: abi-testing.rst: enable --rst-sources when building docs
  docs: ABI: don't escape ReST-incompatible chars from obsolete and removed
  docs: ABI: create a 2-depth index for ABI
  docs: ABI: make it parse ABI/stable as ReST-compatible files
  docs: ABI: sysfs-uevent: make it compatible with ReST output
  docs: ABI: testing: make the files compatible with ReST output
  ...
parents 2376cca0 2fcce37a
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -58,6 +58,14 @@ 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
+4 −4
Original line number Diff line number Diff line
@@ -8,10 +8,10 @@ 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
		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
		2. Enforces deterministic behavior by being strict about
		   what fault scenarios are supported.

		The /sys/class/dax/ interface enumerates all the
+3 −0
Original line number Diff line number Diff line
@@ -7,10 +7,13 @@ 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.
+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 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
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 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.
Loading