Commit 7b0cfee1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'v3.5-rc4' into drm-intel-next-queued 



I want to merge the "no more fake agp on gen6+" patches into
drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also
adds a new use of dev->agp. Hence the backmarge to sort this out, for
otherwise drm-intel-next merged into Linus' tree would conflict in the
relevant code, things would compile but nicely OOPS at driver load :(

Conflicts in this merge are just simple cases of "both branches
changed/added lines at the same place". The only tricky part is to
keep the order correct wrt the unwind code in case of errors in
intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h
together, obviously).

Conflicts:
	drivers/gpu/drm/i915/i915_reg.h
	drivers/gpu/drm/i915/intel_ringbuffer.c

Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 9756fe38 6b16351a

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -111,5 +111,8 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Viresh Kumar <viresh.linux@gmail.com> <viresh.kumar@st.com>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

Documentation/ABI/testing/sysfs-block-rssd

+10 −2
Original line number Diff line number Diff line
@@ -6,13 +6,21 @@ Description: This is a read-only file. Dumps below driver information and 
                hardware registers.

                    - S ACTive

                    - Command Issue

                    - Allocated

                    - Completed

                    - PORT IRQ STAT

                    - HOST IRQ STAT

                    - Allocated

                    - Commands in Q



What:           /sys/block/rssd*/status

Date:           April 2012

KernelVersion:  3.4

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Indicates the status of the device.



What:           /sys/block/rssd*/flags

Date:           May 2012

KernelVersion:  3.5

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps the flags in port and driver

                data structure

Documentation/ABI/testing/sysfs-bus-fcoe

0 → 100644
+77 −0
Original line number Diff line number Diff line 
What:		/sys/bus/fcoe/ctlr_X

Date:		March 2012

KernelVersion:	TBD

Contact:	Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org

Description:	'FCoE Controller' instances on the fcoe bus

Attributes:



	fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing

			  this value will change the dev_loss_tmo for all

			  FCFs discovered by this controller.



	lesb_link_fail:   Link Error Status Block (LESB) link failure count.



	lesb_vlink_fail:  Link Error Status Block (LESB) virtual link

			  failure count.



	lesb_miss_fka:    Link Error Status Block (LESB) missed FCoE

			  Initialization Protocol (FIP) Keep-Alives (FKA).



	lesb_symb_err:    Link Error Status Block (LESB) symbolic error count.



	lesb_err_block:   Link Error Status Block (LESB) block error count.



	lesb_fcs_error:   Link Error Status Block (LESB) Fibre Channel

			  Serivces error count.



Notes: ctlr_X (global increment starting at 0)



What:		/sys/bus/fcoe/fcf_X

Date:		March 2012

KernelVersion:	TBD

Contact:	Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org

Description:	'FCoE FCF' instances on the fcoe bus. A FCF is a Fibre Channel

		Forwarder, which is a FCoE switch that can accept FCoE

		(Ethernet) packets, unpack them, and forward the embedded

		Fibre Channel frames into a FC fabric. It can also take

		outbound FC frames and pack them in Ethernet packets to

		be sent to their destination on the Ethernet segment.

Attributes:



	fabric_name: Identifies the fabric that the FCF services.



	switch_name: Identifies the FCF.



	priority:    The switch's priority amongst other FCFs on the same

		     fabric.



	selected:    1 indicates that the switch has been selected for use;

		     0 indicates that the swich will not be used.



	fc_map:      The Fibre Channel MAP



	vfid:	     The Virtual Fabric ID



	mac:         The FCF's MAC address



	fka_peroid:  The FIP Keep-Alive peroid



	fabric_state: The internal kernel state

		      "Unknown" - Initialization value

		      "Disconnected" - No link to the FCF/fabric

		      "Connected" - Host is connected to the FCF

		      "Deleted" - FCF is being removed from the system



	dev_loss_tmo: The device loss timeout peroid for this FCF.



Notes: A device loss infrastructre similar to the FC Transport's

       is present in fcoe_sysfs. It is nice to have so that a

       link flapping adapter doesn't continually advance the count

       used to identify the discovered FCF. FCFs will exist in a

       "Disconnected" state until either the timer expires and the

       FCF becomes "Deleted" or the FCF is rediscovered and becomes

       "Connected."





Users: The first user of this interface will be the fcoeadm application,

       which is commonly packaged in the fcoe-utils package.

Documentation/ABI/testing/sysfs-bus-iio

+31 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_scale 
What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_supply_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_scale

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_scale

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_peak_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -273,6 +274,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_scale_available 
What:		/sys/.../iio:deviceX/in_voltageX_scale_available

What:		/sys/.../iio:deviceX/in_voltage-voltage_scale_available

What:		/sys/.../iio:deviceX/out_voltageX_scale_available

What:		/sys/.../iio:deviceX/out_altvoltageX_scale_available

What:		/sys/.../iio:deviceX/in_capacitance_scale_available

KernelVersion:	2.635

Contact:	linux-iio@vger.kernel.org
@@ -298,14 +300,19 @@ Description: 
		gives the 3dB frequency of the filter in Hz.



What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_raw

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled, no bias etc.) output voltage for

		channel Y.  The number must always be specified and

		unique if the output corresponds to a single channel.

		While DAC like devices typically use out_voltage,

		a continuous frequency generating device, such as

		a DDS or PLL should use out_altvoltage.



What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY&Z_raw

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY&Z_raw

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -316,6 +323,8 @@ Description: 


What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown_mode

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown_mode

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Description:
@@ -330,6 +339,8 @@ Description: 


What:		/sys/.../iio:deviceX/out_votlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_voltage_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvotlageY_powerdown_mode_available

What:		/sys/.../iio:deviceX/out_altvoltage_powerdown_mode_available

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Description:
@@ -338,6 +349,8 @@ Description: 


What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_voltage_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown

What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltage_powerdown

KernelVersion:	2.6.38

Contact:	linux-iio@vger.kernel.org

Description:
@@ -346,6 +359,24 @@ Description: 
		normal operation. Y may be suppressed if all outputs are

		controlled together.



What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Output frequency for channel Y in Hz. The number must always be

		specified and unique if the output corresponds to a single

		channel.



What:		/sys/bus/iio/devices/iio:deviceX/out_altvoltageY_phase

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Phase in radians of one frequency/clock output Y

		(out_altvoltageY) relative to another frequency/clock output

		(out_altvoltageZ) of the device X. The number must always be

		specified and unique if the output corresponds to a single

		channel.



What:		/sys/bus/iio/devices/iio:deviceX/events

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Documentation/ABI/testing/sysfs-class-mtd

+51 −0
Original line number Diff line number Diff line
@@ -123,3 +123,54 @@ Description: 
		half page, or a quarter page).



		In the case of ECC NOR, it is the ECC block size.



What:		/sys/class/mtd/mtdX/ecc_strength

Date:		April 2012

KernelVersion:	3.4

Contact:	linux-mtd@lists.infradead.org

Description:

		Maximum number of bit errors that the device is capable of

		correcting within each region covering an ecc step.  This will

		always be a non-negative integer.  Note that some devices will

		have multiple ecc steps within each writesize region.



		In the case of devices lacking any ECC capability, it is 0.



What:		/sys/class/mtd/mtdX/bitflip_threshold

Date:		April 2012

KernelVersion:	3.4

Contact:	linux-mtd@lists.infradead.org

Description:

		This allows the user to examine and adjust the criteria by which

		mtd returns -EUCLEAN from mtd_read().  If the maximum number of

		bit errors that were corrected on any single region comprising

		an ecc step (as reported by the driver) equals or exceeds this

		value, -EUCLEAN is returned.  Otherwise, absent an error, 0 is

		returned.  Higher layers (e.g., UBI) use this return code as an

		indication that an erase block may be degrading and should be

		scrutinized as a candidate for being marked as bad.



		The initial value may be specified by the flash device driver.

		If not, then the default value is ecc_strength.



		The introduction of this feature brings a subtle change to the

		meaning of the -EUCLEAN return code.  Previously, it was

		interpreted to mean simply "one or more bit errors were

		corrected".  Its new interpretation can be phrased as "a

		dangerously high number of bit errors were corrected on one or

		more regions comprising an ecc step".  The precise definition of

		"dangerously high" can be adjusted by the user with

		bitflip_threshold.  Users are discouraged from doing this,

		however, unless they know what they are doing and have intimate

		knowledge of the properties of their device.  Broadly speaking,

		bitflip_threshold should be low enough to detect genuine erase

		block degradation, but high enough to avoid the consequences of

		a persistent return value of -EUCLEAN on devices where sticky

		bitflips occur.  Note that if bitflip_threshold exceeds

		ecc_strength, -EUCLEAN is never returned by mtd_read().

		Conversely, if bitflip_threshold is zero, -EUCLEAN is always

		returned, absent a hard error.



		This is generally applicable only to NAND flash devices with ECC

		capability.  It is ignored on devices lacking ECC capability;

		i.e., devices for which ecc_strength is zero.

CRA Git | Maintained and supported by SUSTech CRA and CCSE