Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 695a4612 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'amd-iommu/2.6.32' of... 

Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
parents c7084b35 2b681faf

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com 
D: Soundblaster driver fixes, ISAPnP quirk

S: California, USA



N: Jonathan Layes

D: ARPD support



N: Tom Lees

E: tom@lpsg.demon.co.uk

W: http://www.lpsg.demon.co.uk/
@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12 
S: 2612 XV Delft

S: The Netherlands



N: Thomas Woller

D: CS461x Cirrus Logic sound driver



N: David Woodhouse

E: dwmw2@infradead.org

D: JFFS2 file system, Memory Technology Device subsystem,

Documentation/ABI/testing/sysfs-block

+23 −14
Original line number Diff line number Diff line
@@ -94,28 +94,37 @@ What: /sys/block/<disk>/queue/physical_block_size 
Date:		May 2009

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		This is the smallest unit the storage device can write

		without resorting to read-modify-write operation.  It is

		usually the same as the logical block size but may be

		bigger.  One example is SATA drives with 4KB sectors

		that expose a 512-byte logical block size to the

		operating system.

		This is the smallest unit a physical storage device can

		write atomically.  It is usually the same as the logical

		block size but may be bigger.  One example is SATA

		drives with 4KB sectors that expose a 512-byte logical

		block size to the operating system.  For stacked block

		devices the physical_block_size variable contains the

		maximum physical_block_size of the component devices.



What:		/sys/block/<disk>/queue/minimum_io_size

Date:		April 2009

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Storage devices may report a preferred minimum I/O size,

		which is the smallest request the device can perform

		without incurring a read-modify-write penalty.  For disk

		drives this is often the physical block size.  For RAID

		arrays it is often the stripe chunk size.

		Storage devices may report a granularity or preferred

		minimum I/O size which is the smallest request the

		device can perform without incurring a performance

		penalty.  For disk drives this is often the physical

		block size.  For RAID arrays it is often the stripe

		chunk size.  A properly aligned multiple of

		minimum_io_size is the preferred request size for

		workloads where a high number of I/O operations is

		desired.



What:		/sys/block/<disk>/queue/optimal_io_size

Date:		April 2009

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Storage devices may report an optimal I/O size, which is

		the device's preferred unit of receiving I/O.  This is

		rarely reported for disk drives.  For RAID devices it is

		usually the stripe width or the internal block size.
 
		the device's preferred unit for sustained I/O.  This is

		rarely reported for disk drives.  For RAID arrays it is

		usually the stripe width or the internal track size.  A

		properly aligned multiple of optimal_io_size is the

		preferred request size for workloads where sustained

		throughput is desired.  If no optimal I/O size is

		reported this file contains 0.

Documentation/DocBook/kernel-hacking.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i); 
   </para>



   <programlisting>

__u32 ipaddress;

printk(KERN_INFO "my ip: %d.%d.%d.%d\n", NIPQUAD(ipaddress));

__be32 ipaddress;

printk(KERN_INFO "my ip: %pI4\n", &amp;ipaddress);

   </programlisting>



   <para>

Documentation/arm/memory.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use. 
				For SA11xx and Xscale, this is used to

				setup a minicache mapping.



ffff4000	ffffffff	cache aliasing on ARMv6 and later CPUs.



ffff1000	ffff7fff	Reserved.

				Platforms must not use this address range.

Documentation/filesystems/9p.txt

+3 −0
Original line number Diff line number Diff line
@@ -123,6 +123,9 @@ available from the same CVS repository. 
There are user and developer mailing lists available through the v9fs project

on sourceforge (http://sourceforge.net/projects/v9fs).



A stand-alone version of the module (which should build for any 2.6 kernel)

is available via (http://github.com/ericvh/9p-sac/tree/master)



News and other information is maintained on SWiK (http://swik.net/v9fs).



Bug reports may be issued through the kernel.org bugzilla