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

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

Pull documentation fixes from Jonathan Corbet:
 "A set of straightforward documentation fixes"

* tag 'docs-5.13-3' of git://git.lwn.net/linux:
  Remove link to nonexistent rocket driver docs
  docs: networking: device_drivers: fix bad usage of UTF-8 chars
  docs: hwmon: tmp103.rst: fix bad usage of UTF-8 chars
  docs: ABI: remove some spurious characters
  docs: ABI: remove a meaningless UTF-8 character
  docs: cdrom-standard.rst: get rid of uneeded UTF-8 chars
  Documentation: drop optional BOMs
  docs/zh_CN: Remove obsolete translation file
parents 8d02490c 7240cd20

Documentation/ABI/obsolete/sysfs-kernel-fadump_registered

+1 −1
Original line number Diff line number Diff line 
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬

This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.



What:		/sys/kernel/fadump_registered

Date:		Feb 2012

Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem

+1 −1
Original line number Diff line number Diff line 
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬

This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.



What:		/sys/kernel/fadump_release_mem

Date:		Feb 2012

Documentation/ABI/testing/sysfs-module

+2 −2
Original line number Diff line number Diff line
@@ -37,13 +37,13 @@ Description: Maximum time allowed for periodic transfers per microframe (μs) 


What:		/sys/module/*/{coresize,initsize}

Date:		Jan 2012

KernelVersion:»·3.3

KernelVersion:	3.3

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:	Module size in bytes.



What:		/sys/module/*/taint

Date:		Jan 2012

KernelVersion:»·3.3

KernelVersion:	3.3

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:	Module taint flags:

			==  =====================

Documentation/block/data-integrity.rst

+1 −1
Original line number Diff line number Diff line 
==============

==============

Data Integrity

==============

Documentation/cdrom/cdrom-standard.rst

+15 −15
Original line number Diff line number Diff line
@@ -146,18 +146,18 @@ with the kernel as a block device by registering the following general 
*struct file_operations*::



	struct file_operations cdrom_fops = {

		NULL,			/∗ lseek ∗/

		block _read ,		/∗ read—general block-dev read ∗/

		block _write,		/∗ write—general block-dev write ∗/

		NULL,			/∗ readdir ∗/

		NULL,			/∗ select ∗/

		cdrom_ioctl,		/∗ ioctl ∗/

		NULL,			/∗ mmap ∗/

		cdrom_open,		/∗ open ∗/

		cdrom_release,		/∗ release ∗/

		NULL,			/∗ fsync ∗/

		NULL,			/∗ fasync ∗/

		NULL			/∗ revalidate ∗/

		NULL,			/* lseek */

		block _read ,		/* read--general block-dev read */

		block _write,		/* write--general block-dev write */

		NULL,			/* readdir */

		NULL,			/* select */

		cdrom_ioctl,		/* ioctl */

		NULL,			/* mmap */

		cdrom_open,		/* open */

		cdrom_release,		/* release */

		NULL,			/* fsync */

		NULL,			/* fasync */

		NULL			/* revalidate */

	};



Every active CD-ROM device shares this *struct*. The routines
@@ -569,7 +569,7 @@ the *CDC_CLOSE_TRAY* bit in *mask*. 


In the file `cdrom.c` you will encounter many constructions of the type::



	if (cdo->capability & ∼cdi->mask & CDC _⟨capability⟩) ...

	if (cdo->capability & ~cdi->mask & CDC _<capability>) ...



There is no *ioctl* to set the mask... The reason is that

I think it is better to control the **behavior** rather than the