Merge branch 'linus' into x86/urgent (de66ee97) · Commits · EulixOS / Software / Kernel

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ Brian Avery <b.avery@hp.com>
		Brian King <brking@us.ibm.com>
		Christoph Hellwig <hch@lst.de>
		Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		David Brownell <david-b@pacbell.net>
		David Woodhouse <dwmw2@shinybook.infradead.org>
		Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -2943,6 +2943,10 @@ S: Kasarmikatu 11 A4
		S: 70110 Kuopio
		S: Finland

		N: Tobias Ringström
		E: tori@unhappy.mine.nu
		D: Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver

		N: Luca Risolia
		E: luca.risolia@studio.unibo.it
		P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
		@@ -3913,6 +3917,10 @@ S: Flandernstrasse 101
		S: D-73732 Esslingen
		S: Germany

		N: Roman Zippel
		E: zippel@linux-m68k.org
		D: AFFS and HFS filesystems, m68k maintainer, new kernel configuration in 2.5

		N: Leonard N. Zubkoff
		W: http://www.dandelion.com/Linux/
		D: BusLogic SCSI driver

Documentation/ABI/testing/sysfs-block

+64 −0

Original line number	Diff line number	Diff line
		@@ -142,3 +142,67 @@ Description:
		with the previous I/O request are enabled. When set to 2,
		all merge tries are disabled. The default value is 0 -
		which enables all types of merge tries.

		What: /sys/block/<disk>/discard_alignment
		Date: May 2011
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Devices that support discard functionality may
		internally allocate space in units that are bigger than
		the exported logical block size. The discard_alignment
		parameter indicates how many bytes the beginning of the
		device is offset from the internal allocation unit's
		natural alignment.

		What: /sys/block/<disk>/<partition>/discard_alignment
		Date: May 2011
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Devices that support discard functionality may
		internally allocate space in units that are bigger than
		the exported logical block size. The discard_alignment
		parameter indicates how many bytes the beginning of the
		partition is offset from the internal allocation unit's
		natural alignment.

		What: /sys/block/<disk>/queue/discard_granularity
		Date: May 2011
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Devices that support discard functionality may
		internally allocate space using units that are bigger
		than the logical block size. The discard_granularity
		parameter indicates the size of the internal allocation
		unit in bytes if reported by the device. Otherwise the
		discard_granularity will be set to match the device's
		physical block size. A discard_granularity of 0 means
		that the device does not support discard functionality.

		What: /sys/block/<disk>/queue/discard_max_bytes
		Date: May 2011
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Devices that support discard functionality may have
		internal limits on the number of bytes that can be
		trimmed or unmapped in a single operation. Some storage
		protocols also have inherent limits on the number of
		blocks that can be described in a single command. The
		discard_max_bytes parameter is set by the device driver
		to the maximum number of bytes that can be discarded in
		a single operation. Discard requests issued to the
		device must not exceed this limit. A discard_max_bytes
		value of 0 means that the device does not support
		discard functionality.

		What: /sys/block/<disk>/queue/discard_zeroes_data
		Date: May 2011
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Devices that support discard functionality may return
		stale or random data when a previously discarded block
		is read back. This can cause problems if the filesystem
		expects discarded blocks to be explicitly cleared. If a
		device reports that it deterministically returns zeroes
		when a discarded area is read the discard_zeroes_data
		parameter will be set to one. Otherwise it will be 0 and
		the result of reading a discarded area is undefined.

Documentation/ABI/testing/sysfs-ptp

0 → 100644

+98 −0

Original line number	Diff line number	Diff line
		What: /sys/class/ptp/
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This directory contains files and directories
		providing a standardized interface to the ancillary
		features of PTP hardware clocks.

		What: /sys/class/ptp/ptpN/
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This directory contains the attributes of the Nth PTP
		hardware clock registered into the PTP class driver
		subsystem.

		What: /sys/class/ptp/ptpN/clock_name
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This file contains the name of the PTP hardware clock
		as a human readable string.

		What: /sys/class/ptp/ptpN/max_adjustment
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This file contains the PTP hardware clock's maximum
		frequency adjustment value (a positive integer) in
		parts per billion.

		What: /sys/class/ptp/ptpN/n_alarms
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This file contains the number of periodic or one shot
		alarms offer by the PTP hardware clock.

		What: /sys/class/ptp/ptpN/n_external_timestamps
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This file contains the number of external timestamp
		channels offered by the PTP hardware clock.

		What: /sys/class/ptp/ptpN/n_periodic_outputs
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This file contains the number of programmable periodic
		output channels offered by the PTP hardware clock.

		What: /sys/class/ptp/ptpN/pps_avaiable
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This file indicates whether the PTP hardware clock
		supports a Pulse Per Second to the host CPU. Reading
		"1" means that the PPS is supported, while "0" means
		not supported.

		What: /sys/class/ptp/ptpN/extts_enable
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This write-only file enables or disables external
		timestamps. To enable external timestamps, write the
		channel index followed by a "1" into the file.
		To disable external timestamps, write the channel
		index followed by a "0" into the file.

		What: /sys/class/ptp/ptpN/fifo
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This file provides timestamps on external events, in
		the form of three integers: channel index, seconds,
		and nanoseconds.

		What: /sys/class/ptp/ptpN/period
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This write-only file enables or disables periodic
		outputs. To enable a periodic output, write five
		integers into the file: channel index, start time
		seconds, start time nanoseconds, period seconds, and
		period nanoseconds. To disable a periodic output, set
		all the seconds and nanoseconds values to zero.

		What: /sys/class/ptp/ptpN/pps_enable
		Date: September 2010
		Contact: Richard Cochran <richardcochran@gmail.com>
		Description:
		This write-only file enables or disables delivery of
		PPS events to the Linux PPS subsystem. To enable PPS
		events, write a "1" into the file. To disable events,
		write a "0" into the file.

Documentation/IRQ-affinity.txt

+13 −4

Original line number	Diff line number	Diff line
		@@ -4,10 +4,11 @@ ChangeLog:

		SMP IRQ affinity

		/proc/irq/IRQ#/smp_affinity specifies which target CPUs are permitted
		for a given IRQ source. It's a bitmask of allowed CPUs. It's not allowed
		to turn off all CPUs, and if an IRQ controller does not support IRQ
		affinity then the value will not change from the default 0xffffffff.
		/proc/irq/IRQ#/smp_affinity and /proc/irq/IRQ#/smp_affinity_list specify
		which target CPUs are permitted for a given IRQ source. It's a bitmask
		(smp_affinity) or cpu list (smp_affinity_list) of allowed CPUs. It's not
		allowed to turn off all CPUs, and if an IRQ controller does not support
		IRQ affinity then the value will not change from the default of all cpus.

		/proc/irq/default_smp_affinity specifies default affinity mask that applies
		to all non-active IRQs. Once IRQ is allocated/activated its affinity bitmask
		@@ -54,3 +55,11 @@ round-trip min/avg/max = 0.1/0.5/585.4 ms
		This time around IRQ44 was delivered only to the last four processors.
		i.e counters for the CPU0-3 did not change.

		Here is an example of limiting that same irq (44) to cpus 1024 to 1031:

		[root@moon 44]# echo 1024-1031 > smp_affinity
		[root@moon 44]# cat smp_affinity
		1024-1031

		Note that to do this with a bitmask would require 32 bitmasks of zero
		to follow the pertinent one.