---

yaml
---
r: 156671
b: refs/heads/master
c: 0cc6eee
h: refs/heads/master
i:
  156669: 4b706e7
  156667: d36c961
  156663: 2d9505e
  156655: 4a9cc04
  156639: e9c1439
  156607: 8a41e2a
  156543: d6d4f46
  156415: 3881ff7
  156159: dc27219
  155647: c683d11
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b637dc0dba6a243da2c74f5d02b42ba5eeb9425e
+refs/heads/master: 0cc6eee130b0c062feec8446d9cecdb17d2cfad3

trunk/.gitignore

@@ -3,7 +3,7 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
-# NOTE! Please use 'git ls-files -i --exclude-standard'
+# NOTE! Please use 'git-ls-files -i --exclude-standard'
 # command after changing this file, to see if there are
 # any tracked files which get ignored after the change.
 #
@@ -25,9 +25,6 @@
 *.elf
 *.bin
 *.gz
-*.lzma
-*.patch
-*.gcno
 
 #
 # Top-level generic files
@@ -65,12 +62,6 @@ series
 cscope.*
 ncscope.*
 
-# gnu global files
-GPATH
-GRTAGS
-GSYMS
-GTAGS
-
 *.orig
 *~
 \#*#

trunk/CREDITS

@@ -1253,10 +1253,6 @@ S: 8124 Constitution Apt. 7
 S: Sterling Heights, Michigan 48313
 S: USA
 
-N: Wolfgang Grandegger
-E: wg@grandegger.com
-D: Controller Area Network (device drivers)
-
 N: William Greathouse
 E: wgreathouse@smva.com
 E: wgreathouse@myfavoritei.com
@@ -1856,7 +1852,7 @@ E: rfkoenig@immd4.informatik.uni-erlangen.de
 D: The Linux Support Team Erlangen
 
 N: Andreas Koensgen
-E: ajk@comnets.uni-bremen.de
+E: ajk@iehk.rwth-aachen.de
 D: 6pack driver for AX.25
 
 N: Harald Koerfgen
@@ -2006,9 +2002,6 @@ 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/
@@ -3805,9 +3798,6 @@ 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,

trunk/Documentation/ABI/testing/sysfs-block

@@ -94,37 +94,28 @@ 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 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.
+		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.
 
 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 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.
+		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.
 
 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 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.
+		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.

trunk/Documentation/ABI/testing/sysfs-bus-pci

@@ -122,10 +122,3 @@ Description:
 		This symbolic link appears when a device is a Virtual Function.
 		The symbolic link points to the PCI device sysfs entry of the
 		Physical Function this device associates with.
-
-What:		/sys/bus/pci/slots/.../module
-Date:		June 2009
-Contact:	linux-pci@vger.kernel.org
-Description:
-		This symbolic link points to the PCI hotplug controller driver
-		module that manages the hotplug slot.

trunk/Documentation/ABI/testing/sysfs-fs-ext4

@@ -79,13 +79,3 @@ Description:
 		This file is read-only and shows the number of
 		kilobytes of data that have been written to this
 		filesystem since it was mounted.
-
-What:		/sys/fs/ext4/<disk>/inode_goal
-Date:		June 2008
-Contact:	"Theodore Ts'o" <tytso@mit.edu>
-Description:
-		Tuning parameter which (if non-zero) controls the goal
-		inode used by the inode allocator in p0reference to
-		all other allocation hueristics.  This is intended for
-		debugging use only, and should be 0 on production
-		systems.