Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and... (380622e9) · Commits · 方亚芬 / linux

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -113,3 +113,5 @@ Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
		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-i2c-devices-lm3533

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/i2c/devices/.../output_hvled[n]
		Date: April 2012
		KernelVersion: 3.5
		Contact: Johan Hovold <jhovold@gmail.com>
		Description:
		Set the controlling backlight device for high-voltage current
		sink HVLED[n] (n = 1, 2) (0, 1).

		What: /sys/bus/i2c/devices/.../output_lvled[n]
		Date: April 2012
		KernelVersion: 3.5
		Contact: Johan Hovold <jhovold@gmail.com>
		Description:
		Set the controlling led device for low-voltage current sink
		LVLED[n] (n = 1..5) (0..3).

Documentation/ABI/testing/sysfs-bus-rbd

+2 −2

Original line number	Diff line number	Diff line
		@@ -65,11 +65,11 @@ snap_*
		Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>
		-------------------------------------------------------------

		id
		snap_id

		The rados internal snapshot id assigned for this snapshot

		size
		snap_size

		The size of the image when this snapshot was taken.