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

Commit e9dc1221 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

Merge branch 'nfs-for-2.6.32' of... 

Merge branch 'nfs-for-2.6.32' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 into for-2.6.32-incoming

Conflicts:
	net/sunrpc/cache.c
parents 560ab42e 405d8f8b

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
*.gz

*.gz

*.lzma

*.lzma

*.patch

*.patch

*.gcno





#

#

# Top-level generic files

# Top-level generic files

CREDITS

+7 −1
Original line number Original line Diff line number Diff line
@@ -1856,7 +1856,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de 
D: The Linux Support Team Erlangen

D: The Linux Support Team Erlangen





N: Andreas Koensgen

N: Andreas Koensgen

E: ajk@iehk.rwth-aachen.de

E: ajk@comnets.uni-bremen.de

D: 6pack driver for AX.25

D: 6pack driver for AX.25





N: Harald Koerfgen

N: Harald Koerfgen
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com 
D: Soundblaster driver fixes, ISAPnP quirk

D: Soundblaster driver fixes, ISAPnP quirk

S: California, USA

S: California, USA





N: Jonathan Layes

D: ARPD support



N: Tom Lees

N: Tom Lees

E: tom@lpsg.demon.co.uk

E: tom@lpsg.demon.co.uk

W: http://www.lpsg.demon.co.uk/

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

S: 2612 XV Delft

S: The Netherlands

S: The Netherlands





N: Thomas Woller

D: CS461x Cirrus Logic sound driver



N: David Woodhouse

N: David Woodhouse

E: dwmw2@infradead.org

E: dwmw2@infradead.org

D: JFFS2 file system, Memory Technology Device subsystem,

D: JFFS2 file system, Memory Technology Device subsystem,

Documentation/ABI/testing/sysfs-block

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

Date:		May 2009

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

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

Description:

Description:

		This is the smallest unit the storage device can write

		This is the smallest unit a physical storage device can

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

		write atomically.  It is usually the same as the logical

		usually the same as the logical block size but may be

		block size but may be bigger.  One example is SATA

		bigger.  One example is SATA drives with 4KB sectors

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

		that expose a 512-byte logical block size to the

		block size to the operating system.  For stacked block

		operating system.

		devices the physical_block_size variable contains the

		maximum physical_block_size of the component devices.





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

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

Date:		April 2009

Date:		April 2009

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

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

Description:

Description:

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

		Storage devices may report a granularity or preferred

		which is the smallest request the device can perform

		minimum I/O size which is the smallest request the

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

		device can perform without incurring a performance

		drives this is often the physical block size.  For RAID

		penalty.  For disk drives this is often the physical

		arrays it is often the stripe chunk size.

		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

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

Date:		April 2009

Date:		April 2009

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

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

Description:

Description:

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

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

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

		the device's preferred unit for sustained I/O.  This is

		rarely reported for disk drives.  For RAID devices it is

		rarely reported for disk drives.  For RAID arrays it is

		usually the stripe width or the internal block size.
 
		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 Original line Diff line number Diff line
@@ -449,8 +449,8 @@ printk(KERN_INFO "i = %u\n", i); 
   </para>

   </para>





   <programlisting>

   <programlisting>

__u32 ipaddress;

__be32 ipaddress;

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

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

   </programlisting>

   </programlisting>





   <para>

   <para>

Documentation/DocBook/mac80211.tmpl

+0 −2
Original line number Original line Diff line number Diff line
@@ -184,8 +184,6 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_get

!Finclude/net/mac80211.h ieee80211_ctstoself_get

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_wake_queues

!Finclude/net/mac80211.h ieee80211_wake_queues