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

Commit 1aaaa9ac authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.8-rc3 into usb-next 



We want the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 73577d61 fa8410b3

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/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,

Documentation/networking/rxrpc.txt

+11 −10
Original line number Diff line number Diff line
@@ -790,13 +790,12 @@ The kernel interface functions are as follows: 
     Data messages can have their contents extracted with the usual bunch of

     socket buffer manipulation functions.  A data message can be determined to

     be the last one in a sequence with rxrpc_kernel_is_data_last().  When a

     data message has been used up, rxrpc_kernel_data_delivered() should be

     called on it..

     data message has been used up, rxrpc_kernel_data_consumed() should be

     called on it.



     Non-data messages should be handled to rxrpc_kernel_free_skb() to dispose

     of.  It is possible to get extra refs on all types of message for later

     freeing, but this may pin the state of a call until the message is finally

     freed.

     Messages should be handled to rxrpc_kernel_free_skb() to dispose of.  It

     is possible to get extra refs on all types of message for later freeing,

     but this may pin the state of a call until the message is finally freed.



 (*) Accept an incoming call.
@@ -821,12 +820,14 @@ The kernel interface functions are as follows: 
     Other errors may be returned if the call had been aborted (-ECONNABORTED)

     or had timed out (-ETIME).



 (*) Record the delivery of a data message and free it.

 (*) Record the delivery of a data message.



	void rxrpc_kernel_data_delivered(struct sk_buff *skb);

	void rxrpc_kernel_data_consumed(struct rxrpc_call *call,

					struct sk_buff *skb);



     This is used to record a data message as having been delivered and to

     update the ACK state for the call.  The socket buffer will be freed.

     This is used to record a data message as having been consumed and to

     update the ACK state for the call.  The message must still be passed to

     rxrpc_kernel_free_skb() for disposal by the caller.



 (*) Free a message.