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

Merge tag 'v3.10-rc2' into drm-intel-next-queued 



Backmerge Linux 3.10-rc2 since the various (rather trivial) conflicts
grew a bit out of hand. intel_dp.c has the only real functional
conflict since the logic changed while dev_priv->edp.bpp was moved
around.

Also squash in a whitespace fixup from Ben Widawsky for
i915_gem_gtt.c, git seems to do something pretty strange in there
(which I don't fully understand tbh).

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

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents 98304ad1 c7788792

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -761,6 +761,10 @@ S: Northampton 
S: NN1 3QT

S: United Kingdom



N: Massimo Dal Zotto

E: dz@debian.org

D: i8k Dell laptop SMM driver



N: Uwe Dannowski

E: Uwe.Dannowski@ira.uka.de

W: http://i30www.ira.uka.de/~dannowsk/

Documentation/ABI/testing/sysfs-block-bcache

0 → 100644
+156 −0
Original line number Diff line number Diff line 
What:		/sys/block/<disk>/bcache/unregister

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		A write to this file causes the backing device or cache to be

		unregistered. If a backing device had dirty data in the cache,

		writeback mode is automatically disabled and all dirty data is

		flushed before the device is unregistered. Caches unregister

		all associated backing devices before unregistering themselves.



What:		/sys/block/<disk>/bcache/clear_stats

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		Writing to this file resets all the statistics for the device.



What:		/sys/block/<disk>/bcache/cache

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a backing device that has cache, a symlink to

		the bcache/ dir of that cache.



What:		/sys/block/<disk>/bcache/cache_hits

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: integer number of full cache hits,

		counted per bio. A partial cache hit counts as a miss.



What:		/sys/block/<disk>/bcache/cache_misses

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: integer number of cache misses.



What:		/sys/block/<disk>/bcache/cache_hit_ratio

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: cache hits as a percentage.



What:		/sys/block/<disk>/bcache/sequential_cutoff

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: Threshold past which sequential IO will

		skip the cache. Read and written as bytes in human readable

		units (i.e. echo 10M > sequntial_cutoff).



What:		/sys/block/<disk>/bcache/bypassed

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		Sum of all reads and writes that have bypassed the cache (due

		to the sequential cutoff).  Expressed as bytes in human

		readable units.



What:		/sys/block/<disk>/bcache/writeback

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: When on, writeback caching is enabled and

		writes will be buffered in the cache. When off, caching is in

		writethrough mode; reads and writes will be added to the

		cache but no write buffering will take place.



What:		/sys/block/<disk>/bcache/writeback_running

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: when off, dirty data will not be written

		from the cache to the backing device. The cache will still be

		used to buffer writes until it is mostly full, at which point

		writes transparently revert to writethrough mode. Intended only

		for benchmarking/testing.



What:		/sys/block/<disk>/bcache/writeback_delay

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: In writeback mode, when dirty data is

		written to the cache and the cache held no dirty data for that

		backing device, writeback from cache to backing device starts

		after this delay, expressed as an integer number of seconds.



What:		/sys/block/<disk>/bcache/writeback_percent

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For backing devices: If nonzero, writeback from cache to

		backing device only takes place when more than this percentage

		of the cache is used, allowing more write coalescing to take

		place and reducing total number of writes sent to the backing

		device. Integer between 0 and 40.



What:		/sys/block/<disk>/bcache/synchronous

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a cache, a boolean that allows synchronous mode to be

		switched on and off. In synchronous mode all writes are ordered

		such that the cache can reliably recover from unclean shutdown;

		if disabled bcache will not generally wait for writes to

		complete but if the cache is not shut down cleanly all data

		will be discarded from the cache. Should not be turned off with

		writeback caching enabled.



What:		/sys/block/<disk>/bcache/discard

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a cache, a boolean allowing discard/TRIM to be turned off

		or back on if the device supports it.



What:		/sys/block/<disk>/bcache/bucket_size

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a cache, bucket size in human readable units, as set at

		cache creation time; should match the erase block size of the

		SSD for optimal performance.



What:		/sys/block/<disk>/bcache/nbuckets

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a cache, the number of usable buckets.



What:		/sys/block/<disk>/bcache/tree_depth

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a cache, height of the btree excluding leaf nodes (i.e. a

		one node tree will have a depth of 0).



What:		/sys/block/<disk>/bcache/btree_cache_size

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		Number of btree buckets/nodes that are currently cached in

		memory; cache dynamically grows and shrinks in response to

		memory pressure from the rest of the system.



What:		/sys/block/<disk>/bcache/written

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a cache, total amount of data in human readable units

		written to the cache, excluding all metadata.



What:		/sys/block/<disk>/bcache/btree_written

Date:		November 2010

Contact:	Kent Overstreet <kent.overstreet@gmail.com>

Description:

		For a cache, sum of all btree writes in human readable units.

Documentation/ABI/testing/sysfs-bus-mei

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/bus/mei/devices/.../modalias

Date:		March 2013

KernelVersion:	3.10

Contact:	Samuel Ortiz <sameo@linux.intel.com>

		linux-mei@linux.intel.com

Description:	Stores the same MODALIAS value emitted by uevent

		Format: mei:<mei device name>

Documentation/ABI/testing/sysfs-bus-rbd

+0 −20
Original line number Diff line number Diff line
@@ -66,27 +66,7 @@ current_snap 


	The current snapshot for which the device is mapped.



snap_*



	A directory per each snapshot



parent



	Information identifying the pool, image, and snapshot id for

	the parent image in a layered rbd image (format 2 only).
 


Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>

-------------------------------------------------------------



snap_id



	The rados internal snapshot id assigned for this snapshot



snap_size



	The size of the image when this snapshot was taken.



snap_features



	A hexadecimal encoding of the feature bits for this snapshot.

Documentation/ABI/testing/sysfs-bus-usb

+3 −3
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Date: January 2008 
KernelVersion:	2.6.25

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Description:

		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file

		If CONFIG_PM_RUNTIME is enabled then this file

		is present.  When read, it returns the total time (in msec)

		that the USB device has been connected to the machine.  This

		file is read-only.
@@ -45,7 +45,7 @@ Date: January 2008 
KernelVersion:	2.6.25

Contact:	Sarah Sharp <sarah.a.sharp@intel.com>

Description:

		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file

		If CONFIG_PM_RUNTIME is enabled then this file

		is present.  When read, it returns the total time (in msec)

		that the USB device has been active, i.e. not in a suspended

		state.  This file is read-only.
@@ -187,7 +187,7 @@ What: /sys/bus/usb/devices/.../power/usb2_hardware_lpm 
Date:		September 2011

Contact:	Andiry Xu <andiry.xu@amd.com>

Description:

		If CONFIG_USB_SUSPEND is set and a USB 2.0 lpm-capable device

		If CONFIG_PM_RUNTIME is set and a USB 2.0 lpm-capable device

		is plugged in to a xHCI host which support link PM, it will

		perform a LPM test; if the test is passed and host supports

		USB2 hardware LPM (xHCI 1.0 feature), USB2 hardware LPM will

CRA Git | Maintained and supported by SUSTech CRA and CCSE