Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d2f4d0c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

Back-merge from for-linus just to make the further development easier.
parents 09da111a 3f640970

Documentation/block/queue-sysfs.txt

+18 −0
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ add_random (RW) 
This file allows to turn off the disk entropy contribution. Default

value of this file is '1'(on).



dax (RO)

--------

This file indicates whether the device supports Direct Access (DAX),

used by CPU-addressable storage to bypass the pagecache.  It shows '1'

if true, '0' if not.



discard_granularity (RO)

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

This shows the size of internal allocation of the device in bytes, if
@@ -46,6 +52,12 @@ hw_sector_size (RO) 
-------------------

This is the hardware sector size of the device, in bytes.



io_poll (RW)

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

When read, this file shows the total number of block IO polls and how

many returned success.  Writing '0' to this file will disable polling

for this device.  Writing any non-zero value will enable this feature.



iostats (RW)

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

This file is used to control (on/off) the iostats accounting of the
@@ -151,5 +163,11 @@ device state. This means that it might not be safe to toggle the 
setting from "write back" to "write through", since that will also

eliminate cache flushes issued by the kernel.



write_same_max_bytes (RO)

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

This is the number of bytes the device can write in a single write-same

command.  A value of '0' means write-same is not supported by this

device.





Jens Axboe <jens.axboe@oracle.com>, February 2009

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ pygments_style = 'sphinx' 
todo_include_todos = False



primary_domain = 'C'

highlight_language = 'C'

highlight_language = 'guess'



# -- Options for HTML output ----------------------------------------------

Documentation/devicetree/bindings/sound/omap-mcpdm.txt

+0 −10
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ Required properties: 
- interrupts: Interrupt number for McPDM

- interrupt-parent: The parent interrupt controller

- ti,hwmods: Name of the hwmod associated to the McPDM

- clocks:  phandle for the pdmclk provider, likely <&twl6040>

- clock-names: Must be "pdmclk"



Example:
@@ -21,11 +19,3 @@ mcpdm: mcpdm@40132000 { 
	interrupt-parent = <&gic>;

	ti,hwmods = "mcpdm";

};
 


In board DTS file the pdmclk needs to be added:



&mcpdm {

	clocks = <&twl6040>;

	clock-names = "pdmclk";

	status = "okay";

};

Documentation/hwmon/ftsteutates

+2 −2
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ enhancements. It can monitor up to 4 voltages, 16 temperatures and 
implemented in this driver.



Specification of the chip can be found here:

ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/BMC-Teutates_Specification_V1.21.pdf

ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf
 
ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/BMC-Teutates_Specification_V1.21.pdf

ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf

Documentation/kernel-documentation.rst

+0 −6
Original line number Diff line number Diff line
@@ -366,8 +366,6 @@ Domain`_ references. 
Cross-referencing from reStructuredText

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



.. highlight:: none



To cross-reference the functions and types defined in the kernel-doc comments

from reStructuredText documents, please use the `Sphinx C Domain`_

references. For example::
@@ -390,8 +388,6 @@ For further details, please refer to the `Sphinx C Domain`_ documentation. 
Function documentation

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



.. highlight:: c



The general format of a function and function-like macro kernel-doc comment is::



  /**
@@ -572,8 +568,6 @@ DocBook XML [DEPRECATED] 
Converting DocBook to Sphinx

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



.. highlight:: none



Over time, we expect all of the documents under ``Documentation/DocBook`` to be

converted to Sphinx and reStructuredText. For most DocBook XML documents, a good

enough solution is to use the simple ``Documentation/sphinx/tmplcvt`` script,