Merge branch 'perf/urgent' into perf/core (fafd883f) · Commits · 戴 / test

CREDITS

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -637,14 +637,13 @@ S: 14509 NE 39th Street #1096
	S: Bellevue, Washington 98007		S: Bellevue, Washington 98007
	S: USA		S: USA

	N: Christopher L. Cheney		N: Chris Cheney
	E: ccheney@debian.org		E: chris.cheney@gmail.com
	E: ccheney@cheney.cx		E: ccheney@redhat.com
	W: http://www.cheney.cx
	P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2		P: 1024D/8E384AF2 2D31 1927 87D7 1F24 9FF9 1BC5 D106 5AB3 8E38 4AF2
	D: Vista Imaging usb webcam driver		D: Vista Imaging usb webcam driver
	S: 314 Prince of Wales		S: 2308 Therrell Way
	S: Conroe, TX 77304		S: McKinney, TX 75070
	S: USA		S: USA

	N: Stuart Cheshire		N: Stuart Cheshire
	@@ -1120,6 +1119,7 @@ D: author of userfs filesystem
	D: Improved mmap and munmap handling		D: Improved mmap and munmap handling
	D: General mm minor tidyups		D: General mm minor tidyups
	D: autofs v4 maintainer		D: autofs v4 maintainer
			D: Xen subsystem
	S: 987 Alabama St		S: 987 Alabama St
	S: San Francisco		S: San Francisco
	S: CA, 94110		S: CA, 94110
	@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario
	S: Canada K2P 0X8		S: Canada K2P 0X8

	N: Mikael Pettersson		N: Mikael Pettersson
	E: mikpe@it.uu.se		E: mikpelinux@gmail.com
	W: http://user.it.uu.se/~mikpe/linux/
	D: Miscellaneous fixes		D: Miscellaneous fixes

	N: Reed H. Petty		N: Reed H. Petty

Documentation/00-INDEX

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@ IPMI.txt
	IRQ-affinity.txt		IRQ-affinity.txt
	- how to select which CPU(s) handle which interrupt events on SMP.		- how to select which CPU(s) handle which interrupt events on SMP.
	IRQ-domain.txt		IRQ-domain.txt
	- info on inerrupt numbering and setting up IRQ domains.		- info on interrupt numbering and setting up IRQ domains.
	IRQ.txt		IRQ.txt
	- description of what an IRQ is.		- description of what an IRQ is.
	Intel-IOMMU.txt		Intel-IOMMU.txt

Documentation/ABI/testing/sysfs-block-zram

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -5,20 +5,21 @@ Description:
	The disksize file is read-write and specifies the disk size		The disksize file is read-write and specifies the disk size
	which represents the limit on the uncompressed worth of data		which represents the limit on the uncompressed worth of data
	that can be stored in this disk.		that can be stored in this disk.
			Unit: bytes

	What: /sys/block/zram<id>/initstate		What: /sys/block/zram<id>/initstate
	Date: August 2010		Date: August 2010
	Contact: Nitin Gupta <ngupta@vflare.org>		Contact: Nitin Gupta <ngupta@vflare.org>
	Description:		Description:
	The disksize file is read-only and shows the initialization		The initstate file is read-only and shows the initialization
	state of the device.		state of the device.

	What: /sys/block/zram<id>/reset		What: /sys/block/zram<id>/reset
	Date: August 2010		Date: August 2010
	Contact: Nitin Gupta <ngupta@vflare.org>		Contact: Nitin Gupta <ngupta@vflare.org>
	Description:		Description:
	The disksize file is write-only and allows resetting the		The reset file is write-only and allows resetting the
	device. The reset operation frees all the memory assocaited		device. The reset operation frees all the memory associated
	with this device.		with this device.

	What: /sys/block/zram<id>/num_reads		What: /sys/block/zram<id>/num_reads
	@@ -48,7 +49,7 @@ Contact: Nitin Gupta <ngupta@vflare.org>
	Description:		Description:
	The notify_free file is read-only and specifies the number of		The notify_free file is read-only and specifies the number of
	swap slot free notifications received by this device. These		swap slot free notifications received by this device. These
	notifications are send to a swap block device when a swap slot		notifications are sent to a swap block device when a swap slot
	is freed. This statistic is applicable only when this disk is		is freed. This statistic is applicable only when this disk is
	being used as a swap disk.		being used as a swap disk.

Documentation/ABI/testing/sysfs-class-mtd

+14 −3

Original line number	Original line	Diff line number	Diff line
	@@ -128,9 +128,8 @@ KernelVersion: 3.4
	Contact: linux-mtd@lists.infradead.org		Contact: linux-mtd@lists.infradead.org
	Description:		Description:
	Maximum number of bit errors that the device is capable of		Maximum number of bit errors that the device is capable of
	correcting within each region covering an ecc step. This will		correcting within each region covering an ECC step (see
	always be a non-negative integer. Note that some devices will		ecc_step_size). This will always be a non-negative integer.
	have multiple ecc steps within each writesize region.

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

	@@ -173,3 +172,15 @@ Description:
	This is generally applicable only to NAND flash devices with ECC		This is generally applicable only to NAND flash devices with ECC
	capability. It is ignored on devices lacking ECC capability;		capability. It is ignored on devices lacking ECC capability;
	i.e., devices for which ecc_strength is zero.		i.e., devices for which ecc_strength is zero.

			What: /sys/class/mtd/mtdX/ecc_step_size
			Date: May 2013
			KernelVersion: 3.10
			Contact: linux-mtd@lists.infradead.org
			Description:
			The size of a single region covered by ECC, known as the ECC
			step. Devices may have several equally sized ECC steps within
			each writesize region.

			It will always be a non-negative integer. In the case of
			devices lacking any ECC capability, it is 0.

Documentation/ABI/testing/sysfs-fs-f2fs

0 → 100644

+26 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/fs/f2fs/<disk>/gc_max_sleep_time
			Date: July 2013
			Contact: "Namjae Jeon" <namjae.jeon@samsung.com>
			Description:
			Controls the maximun sleep time for gc_thread. Time
			is in milliseconds.

			What: /sys/fs/f2fs/<disk>/gc_min_sleep_time
			Date: July 2013
			Contact: "Namjae Jeon" <namjae.jeon@samsung.com>
			Description:
			Controls the minimum sleep time for gc_thread. Time
			is in milliseconds.

			What: /sys/fs/f2fs/<disk>/gc_no_gc_sleep_time
			Date: July 2013
			Contact: "Namjae Jeon" <namjae.jeon@samsung.com>
			Description:
			Controls the default sleep time for gc_thread. Time
			is in milliseconds.

			What: /sys/fs/f2fs/<disk>/gc_idle
			Date: July 2013
			Contact: "Namjae Jeon" <namjae.jeon@samsung.com>
			Description:
			Controls the victim selection policy for garbage collection.

Admin message