Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (9cdf083f) · Commits · e / devices / android_kernel_xiaomi_markw

.gitignore

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,3 +42,6 @@ patches-*
	# quilt's files		# quilt's files
	patches		patches
	series		series

			# cscope files
			cscope.*

CREDITS

+15 −3

Original line number	Original line	Diff line number	Diff line
	@@ -516,9 +516,10 @@ S: Orlando, Florida
	S: USA		S: USA

	N: Lennert Buytenhek		N: Lennert Buytenhek
	E: buytenh@gnu.org		E: kernel@wantstofly.org
	D: Rewrite of the ethernet bridging code		D: Original (2.4) rewrite of the ethernet bridging code
	S: Ravenhorst 58B		D: Various ARM bits and pieces
			S: Ravenhorst 58
	S: 2317 AK Leiden		S: 2317 AK Leiden
	S: The Netherlands		S: The Netherlands

	@@ -1808,6 +1809,14 @@ S: Kruislaan 419
	S: 1098 VA Amsterdam		S: 1098 VA Amsterdam
	S: The Netherlands		S: The Netherlands

			N: Jiri Kosina
			E: jikos@jikos.cz
			E: jkosina@suse.cz
			D: Generic HID layer - original code split, fixes
			D: Various ACPI fixes, keeping correct battery state through suspend
			D: various lockdep annotations, autofs and other random bugfixes
			S: Prague, Czech Republic

	N: Gene Kozin		N: Gene Kozin
	E: 74604.152@compuserve.com		E: 74604.152@compuserve.com
	W: http://www.sangoma.com		W: http://www.sangoma.com
	@@ -2598,6 +2607,9 @@ S: Ucitelska 1576
	S: Prague 8		S: Prague 8
	S: 182 00 Czech Republic		S: 182 00 Czech Republic

			N: Rick Payne
			D: RFC2385 Support for TCP

	N: Barak A. Pearlmutter		N: Barak A. Pearlmutter
	E: bap@cs.unm.edu		E: bap@cs.unm.edu
	W: http://www.cs.unm.edu/~bap/		W: http://www.cs.unm.edu/~bap/

Documentation/00-INDEX

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -104,8 +104,6 @@ firmware_class/
	- request_firmware() hotplug interface info.		- request_firmware() hotplug interface info.
	floppy.txt		floppy.txt
	- notes and driver options for the floppy disk driver.		- notes and driver options for the floppy disk driver.
	ftape.txt
	- notes about the floppy tape device driver.
	hayes-esp.txt		hayes-esp.txt
	- info on using the Hayes ESP serial driver.		- info on using the Hayes ESP serial driver.
	highuid.txt		highuid.txt

Documentation/ABI/testing/debugfs-pktcdvd

0 → 100644

+20 −0

Original line number	Original line	Diff line number	Diff line
			What: /debug/pktcdvd/pktcdvd[0-7]
			Date: Oct. 2006
			KernelVersion: 2.6.19
			Contact: Thomas Maier <balagi@justmail.de>
			Description:

			debugfs interface
			-----------------

			The pktcdvd module (packet writing driver) creates
			these files in debugfs:

			/debug/pktcdvd/pktcdvd[0-7]/
			info (0444) Lots of human readable driver
			statistics and infos. Multiple lines!

			Example:
			-------

			cat /debug/pktcdvd/pktcdvd0/info

Documentation/ABI/testing/sysfs-class-pktcdvd

0 → 100644

+72 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/class/pktcdvd/
			Date: Oct. 2006
			KernelVersion: 2.6.19
			Contact: Thomas Maier <balagi@justmail.de>
			Description:

			sysfs interface
			---------------

			The pktcdvd module (packet writing driver) creates
			these files in the sysfs:
			(<devid> is in format major:minor )

			/sys/class/pktcdvd/
			add (0200) Write a block device id (major:minor)
			to create a new pktcdvd device and map
			it to the block device.

			remove (0200) Write the pktcdvd device id (major:minor)
			to it to remove the pktcdvd device.

			device_map (0444) Shows the device mapping in format:
			pktcdvd[0-7] <pktdevid> <blkdevid>

			/sys/class/pktcdvd/pktcdvd[0-7]/
			dev (0444) Device id
			uevent (0200) To send an uevent.

			/sys/class/pktcdvd/pktcdvd[0-7]/stat/
			packets_started (0444) Number of started packets.
			packets_finished (0444) Number of finished packets.

			kb_written (0444) kBytes written.
			kb_read (0444) kBytes read.
			kb_read_gather (0444) kBytes read to fill write packets.

			reset (0200) Write any value to it to reset
			pktcdvd device statistic values, like
			bytes read/written.

			/sys/class/pktcdvd/pktcdvd[0-7]/write_queue/
			size (0444) Contains the size of the bio write
			queue.

			congestion_off (0644) If bio write queue size is below
			this mark, accept new bio requests
			from the block layer.

			congestion_on (0644) If bio write queue size is higher
			as this mark, do no longer accept
			bio write requests from the block
			layer and wait till the pktcdvd
			device has processed enough bio's
			so that bio write queue size is
			below congestion off mark.
			A value of <= 0 disables congestion
			control.


			Example:
			--------
			To use the pktcdvd sysfs interface directly, you can do:

			# create a new pktcdvd device mapped to /dev/hdc
			echo "22:0" >/sys/class/pktcdvd/add
			cat /sys/class/pktcdvd/device_map
			# assuming device pktcdvd0 was created, look at stat's
			cat /sys/class/pktcdvd/pktcdvd0/stat/kb_written
			# print the device id of the mapped block device
			fgrep pktcdvd0 /sys/class/pktcdvd/device_map
			# remove device, using pktcdvd0 device id 253:0
			echo "253:0" >/sys/class/pktcdvd/remove