Commit 62813858 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid',... 

Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus
parents b2b98ea8 94037efe 875e36f8 61ebca93 274be3eb

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -655,6 +655,11 @@ S: Stanford University 
S: Stanford, California 94305

S: USA



N: Carlos Chinea

E: carlos.chinea@nokia.com

E: cch.devel@gmail.com

D: Author of HSI Subsystem



N: Randolph Chung

E: tausq@debian.org

D: Linux/PA-RISC hacker

Documentation/ABI/stable/sysfs-driver-ib_srp

+13 −0
Original line number Diff line number Diff line
@@ -61,6 +61,12 @@ Description: Interface for making ib_srp connect to a new target. 
		  interrupt is handled by a different CPU then the comp_vector

		  parameter can be used to spread the SRP completion workload

		  over multiple CPU's.

		* tl_retry_count, a number in the range 2..7 specifying the

		  IB RC retry count.

		* queue_size, the maximum number of commands that the

		  initiator is allowed to queue per SCSI host. The default

		  value for this parameter is 62. The lowest supported value

		  is 2.



What:		/sys/class/infiniband_srp/srp-<hca>-<port_number>/ibdev

Date:		January 2, 2006
@@ -153,6 +159,13 @@ Contact: linux-rdma@vger.kernel.org 
Description:	InfiniBand service ID used for establishing communication with

		the SRP	target.



What:		/sys/class/scsi_host/host<n>/sgid

Date:		February 1, 2014

KernelVersion:	3.13

Contact:	linux-rdma@vger.kernel.org

Description:	InfiniBand GID of the source port used for communication with

		the SRP target.



What:		/sys/class/scsi_host/host<n>/zero_req_lim

Date:		September 20, 2006

KernelVersion:	2.6.18

Documentation/ABI/stable/sysfs-transport-srp

+39 −0
Original line number Diff line number Diff line
@@ -5,6 +5,24 @@ Contact: linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org 
Description:	Instructs an SRP initiator to disconnect from a target and to

		remove all LUNs imported from that target.



What:		/sys/class/srp_remote_ports/port-<h>:<n>/dev_loss_tmo

Date:		February 1, 2014

KernelVersion:	3.13

Contact:	linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org

Description:	Number of seconds the SCSI layer will wait after a transport

		layer error has been observed before removing a target port.

		Zero means immediate removal. Setting this attribute to "off"

		will disable the dev_loss timer.



What:		/sys/class/srp_remote_ports/port-<h>:<n>/fast_io_fail_tmo

Date:		February 1, 2014

KernelVersion:	3.13

Contact:	linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org

Description:	Number of seconds the SCSI layer will wait after a transport

		layer error has been observed before failing I/O. Zero means

		failing I/O immediately. Setting this attribute to "off" will

		disable the fast_io_fail timer.



What:		/sys/class/srp_remote_ports/port-<h>:<n>/port_id

Date:		June 27, 2007

KernelVersion:	2.6.24
@@ -12,8 +30,29 @@ Contact: linux-scsi@vger.kernel.org 
Description:	16-byte local SRP port identifier in hexadecimal format. An

		example: 4c:49:4e:55:58:20:56:49:4f:00:00:00:00:00:00:00.



What:		/sys/class/srp_remote_ports/port-<h>:<n>/reconnect_delay

Date:		February 1, 2014

KernelVersion:	3.13

Contact:	linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org

Description:	Number of seconds the SCSI layer will wait after a reconnect

		attempt failed before retrying. Setting this attribute to

		"off" will disable time-based reconnecting.



What:		/sys/class/srp_remote_ports/port-<h>:<n>/roles

Date:		June 27, 2007

KernelVersion:	2.6.24

Contact:	linux-scsi@vger.kernel.org

Description:	Role of the remote port. Either "SRP Initiator" or "SRP Target".



What:		/sys/class/srp_remote_ports/port-<h>:<n>/state

Date:		February 1, 2014

KernelVersion:	3.13

Contact:	linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org

Description:	State of the transport layer used for communication with the

		remote port. "running" if the transport layer is operational;

		"blocked" if a transport layer error has been encountered but

		the fast_io_fail_tmo timer has not yet fired; "fail-fast"

		after the fast_io_fail_tmo timer has fired and before the

		"dev_loss_tmo" timer has fired; "lost" after the

		"dev_loss_tmo" timer has fired and before the port is finally

		removed.

Documentation/Changes

+0 −11
Original line number Diff line number Diff line
@@ -196,13 +196,6 @@ chmod 0644 /dev/cpu/microcode 
as root before you can use this.  You'll probably also want to

get the user-space microcode_ctl utility to use with this.



Powertweak

----------



If you are running v0.1.17 or earlier, you should upgrade to

version v0.99.0 or higher. Running old versions may cause problems

with programs using shared memory.



udev

----

udev is a userspace application for populating /dev dynamically with
@@ -366,10 +359,6 @@ Intel P6 microcode 
------------------

o  <http://www.urbanmyth.org/microcode/>



Powertweak

----------

o  <http://powertweak.sourceforge.net/>



udev

----

o <http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html>

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
     </sect1>

     <sect1><title>Wait queues and Wake events</title>

!Iinclude/linux/wait.h

!Ekernel/wait.c

!Ekernel/sched/wait.c

     </sect1>

     <sect1><title>High-resolution timers</title>

!Iinclude/linux/ktime.h