Merge 3.10-rc6 into usb-next (1508124d) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/bcache.txt

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -319,7 +319,10 @@ cache<0..n>
	Symlink to each of the cache devices comprising this cache set.		Symlink to each of the cache devices comprising this cache set.

	cache_available_percent		cache_available_percent
	Percentage of cache device free.		Percentage of cache device which doesn't contain dirty data, and could
			potentially be used for writeback. This doesn't mean this space isn't used
			for clean cached data; the unused statistic (in priority_stats) is typically
			much lower.

	clear_stats		clear_stats
	Clears the statistics associated with this cache		Clears the statistics associated with this cache
	@@ -423,8 +426,11 @@ nbuckets
	Total buckets in this cache		Total buckets in this cache

	priority_stats		priority_stats
	Statistics about how recently data in the cache has been accessed. This can		Statistics about how recently data in the cache has been accessed.
	reveal your working set size.		This can reveal your working set size. Unused is the percentage of
			the cache that doesn't contain any data. Metadata is bcache's
			metadata overhead. Average is the average priority of cache buckets.
			Next is a list of quantiles with the priority threshold of each.

	written		written
	Sum of all data that has been written to the cache; comparison with		Sum of all data that has been written to the cache; comparison with

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -498,12 +498,8 @@ Your cooperation is appreciated.

	Each device type has 5 bits (32 minors).		Each device type has 5 bits (32 minors).

	13 block 8-bit MFM/RLL/IDE controller		13 block Previously used for the XT disk (/dev/xdN)
	0 = /dev/xda First XT disk whole disk		Deleted in kernel v3.9.
	64 = /dev/xdb Second XT disk whole disk

	Partitions are handled in the same way as IDE disks
	(see major number 3).

	14 char Open Sound System (OSS)		14 char Open Sound System (OSS)
	0 = /dev/mixer Mixer control		0 = /dev/mixer Mixer control

+1 −1

Original line number	Original line	Diff line number	Diff line
	Atmel AT91RM9200 Real Time Clock		Atmel AT91RM9200 Real Time Clock

	Required properties:		Required properties:
	- compatible: should be: "atmel,at91rm9200-rtc"		- compatible: should be: "atmel,at91rm9200-rtc" or "atmel,at91sam9x5-rtc"
	- reg: physical base address of the controller and length of memory mapped		- reg: physical base address of the controller and length of memory mapped
	region.		region.
	- interrupts: rtc alarm/event interrupt		- interrupts: rtc alarm/event interrupt

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3351,9 +3351,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	plus one apbt timer for broadcast timer.		plus one apbt timer for broadcast timer.
	x86_mrst_timer=apbt_only \| lapic_and_apbt		x86_mrst_timer=apbt_only \| lapic_and_apbt

	xd= [HW,XT] Original XT pre-IDE (RLL encoded) disks.
	xd_geo= See header of drivers/block/xd.c.

	xen_emul_unplug= [HW,X86,XEN]		xen_emul_unplug= [HW,X86,XEN]
	Unplug Xen emulated devices		Unplug Xen emulated devices
	Format: [unplug0,][unplug1]		Format: [unplug0,][unplug1]

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -80,8 +80,6 @@ Valid names are:
	/dev/sdd: -> 0x0830 (forth SCSI disk)		/dev/sdd: -> 0x0830 (forth SCSI disk)
	/dev/sde: -> 0x0840 (fifth SCSI disk)		/dev/sde: -> 0x0840 (fifth SCSI disk)
	/dev/fd : -> 0x0200 (floppy disk)		/dev/fd : -> 0x0200 (floppy disk)
	/dev/xda: -> 0x0c00 (first XT disk, unused in Linux/m68k)
	/dev/xdb: -> 0x0c40 (second XT disk, unused in Linux/m68k)

	The name must be followed by a decimal number, that stands for the		The name must be followed by a decimal number, that stands for the
	partition number. Internally, the value of the number is just		partition number. Internally, the value of the number is just