Commit f7698ba7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'v3.13-rc3' into drm-intel-next-queued 



Linux 3.13-rc3

I need a backmerge for two reasons:
- For merging the ppgtt patches from Ben I need to pull in the bdw
  support.
- We now have duplicated calls to intel_uncore_forcewake_reset in the
  setup code to due 2 different patches merged into -next and 3.13.
  The conflict is silen so I need the merge to be able to apply
  Deepak's fixup patch.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

Trivial conflict, it doesn't even show up in the merge diff.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 798183c5 374b1057

CREDITS

+11 −1
Original line number Diff line number Diff line
@@ -2576,7 +2576,7 @@ S: Toronto, Ontario 
S: Canada



N: Zwane Mwaikambo

E: zwane@arm.linux.org.uk

E: zwanem@gmail.com

D: Various driver hacking

D: Lowlevel x86 kernel hacking

D: General debugging
@@ -2895,6 +2895,11 @@ S: Framewood Road 
S: Wexham SL3 6PJ

S: United Kingdom



N: Richard Purdie

E: rpurdie@rpsys.net

D: Backlight subsystem maintainer

S: United Kingdom



N: Daniel Quinlan

E: quinlan@pathname.com

W: http://www.pathname.com/~quinlan/
@@ -3152,6 +3157,11 @@ N: Dipankar Sarma 
E: dipankar@in.ibm.com

D: RCU



N: Yoshinori Sato

E: ysato@users.sourceforge.jp

D: uClinux for Renesas H8/300 (H8300)

D: http://uclinux-h8.sourceforge.jp/



N: Hannu Savolainen

E: hannu@opensound.com

D: Maintainer of the sound drivers until 2.1.x days.

Documentation/ABI/README

+13 −0
Original line number Diff line number Diff line
@@ -72,3 +72,16 @@ kernel tree without going through the obsolete state first. 


It's up to the developer to place their interfaces in the category they

wish for it to start out in.





Notable bits of non-ABI, which should not under any circumstances be considered

stable:



- Kconfig.  Userspace should not rely on the presence or absence of any

  particular Kconfig symbol, in /proc/config.gz, in the copy of .config

  commonly installed to /boot, or in any invocation of the kernel build

  process.



- Kernel-internal symbols.  Do not rely on the presence, absence, location, or

  type of any kernel symbol, either in System.map files or the kernel binary

  itself.  See Documentation/stable_api_nonsense.txt.

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/ABI/testing/configfs-usb-gadget-mass-storage

0 → 100644
+31 −0
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/mass_storage.name

Date:		Oct 2013

KenelVersion:	3.13

Description:

		The attributes:



		stall		- Set to permit function to halt bulk endpoints.

				Disabled on some USB devices known not to work

				correctly. You should set it to true.

		num_buffers	- Number of pipeline buffers. Valid numbers

				are 2..4. Available only if

				CONFIG_USB_GADGET_DEBUG_FILES is set.



What:		/config/usb-gadget/gadget/functions/mass_storage.name/lun.name

Date:		Oct 2013

KenelVersion:	3.13

Description:

		The attributes:



		file		- The path to the backing file for the LUN.

				Required if LUN is not marked as removable.

		ro		- Flag specifying access to the LUN shall be

				read-only. This is implied if CD-ROM emulation

				is enabled as well as when it was impossible

				to open "filename" in R/W mode.

		removable	- Flag specifying that LUN shall be indicated as

				being removable.

		cdrom		- Flag specifying that LUN shall be reported as

				being a CD-ROM.

		nofua		- Flag specifying that FUA flag

				in SCSI WRITE(10,12)

CRA Git | Maintained and supported by SUSTech CRA and CCSE