Merge tag 'v4.8-rc3' into x86/asm, to pick up fixes (eb4e8410) · Commits · e / devices / android_kernel_teracube_2e

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.

Documentation/power/basic-pm-debugging.txt

+26 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,32 @@ load n/2 modules more and try again.
		Again, if you find the offending module(s), it(they) must be unloaded every time
		before hibernation, and please report the problem with it(them).

		c) Advanced debugging
		c) Using the "test_resume" hibernation option

		/sys/power/disk generally tells the kernel what to do after creating a
		hibernation image. One of the available options is "test_resume" which
		causes the just created image to be used for immediate restoration. Namely,
		after doing:

		# echo test_resume > /sys/power/disk
		# echo disk > /sys/power/state

		a hibernation image will be created and a resume from it will be triggered
		immediately without involving the platform firmware in any way.

		That test can be used to check if failures to resume from hibernation are
		related to bad interactions with the platform firmware. That is, if the above
		works every time, but resume from actual hibernation does not work or is
		unreliable, the platform firmware may be responsible for the failures.

		On architectures and platforms that support using different kernels to restore
		hibernation images (that is, the kernel used to read the image from storage and
		load it into memory is different from the one included in the image) or support
		kernel address space randomization, it also can be used to check if failures
		to resume may be related to the differences between the restore and image
		kernels.

		d) Advanced debugging

		In case that hibernation does not work on your system even in the minimal
		configuration and compiling more drivers as modules is not practical or some