---

yaml
---
r: 175610
b: refs/heads/master
c: ebd893d
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5de76b18d1a7193c49c1a4ee72261421a17de57c
+refs/heads/master: ebd893ded2733b8bd9ba403ee4a9e6ab6fbc2a54

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

@@ -144,16 +144,3 @@ Description:
 
 		Write a 1 to force the device to disconnect
 		(equivalent to unplugging a wired USB device).
-
-What:		/sys/bus/usb/drivers/.../remove_id
-Date:		November 2009
-Contact:	CHENG Renquan <rqcheng@smu.edu.sg>
-Description:
-		Writing a device ID to this file will remove an ID
-		that was dynamically added via the new_id sysfs entry.
-		The format for the device ID is:
-		idVendor idProduct.	After successfully
-		removing an ID, the driver will no longer support the
-		device.  This is useful to ensure auto probing won't
-		match the driver to the device.  For example:
-		# echo "046d c315" > /sys/bus/usb/drivers/foo/remove_id

trunk/Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc

@@ -23,16 +23,3 @@ Description:
                 Since this relates to security (specifically, the
                 lifetime of PTKs and GTKs) it should not be changed
                 from the default.
-
-What:           /sys/class/uwb_rc/uwbN/wusbhc/wusb_phy_rate
-Date:           August 2009
-KernelVersion:  2.6.32
-Contact:        David Vrabel <david.vrabel@csr.com>
-Description:
-                The maximum PHY rate to use for all connected devices.
-                This is only of limited use for testing and
-                development as the hardware's automatic rate
-                adaptation is better then this simple control.
-
-                Refer to [ECMA-368] section 10.3.1.1 for the value to
-                use.

trunk/Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -136,24 +136,6 @@ Description:	Discover cpuidle policy and mechanism
 		See files in Documentation/cpuidle/ for more information.
 
 
-What:		/sys/devices/system/cpu/cpu#/cpufreq/*
-Date:		pre-git history
-Contact:	cpufreq@vger.kernel.org
-Description:	Discover and change clock speed of CPUs
-
-		Clock scaling allows you to change the clock speed of the
-		CPUs on the fly. This is a nice method to save battery
-		power, because the lower the clock speed, the less power
-		the CPU consumes.
-
-		There are many knobs to tweak in this directory.
-
-		See files in Documentation/cpu-freq/ for more information.
-
-		In particular, read Documentation/cpu-freq/user-guide.txt
-		to learn how to control the knobs.
-
-
 What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
 Date:      August 2008
 KernelVersion:	2.6.27

trunk/Documentation/ABI/testing/sysfs-kernel-slab

@@ -45,9 +45,8 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The alloc_fastpath file shows how many objects have been
-		allocated using the fast path.  It can be written to clear the
-		current count.
+		The alloc_fastpath file is read-only and specifies how many
+		objects have been allocated using the fast path.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/alloc_from_partial
@@ -56,10 +55,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The alloc_from_partial file shows how many times a cpu slab has
-		been full and it has been refilled by using a slab from the list
-		of partially used slabs.  It can be written to clear the current
-		count.
+		The alloc_from_partial file is read-only and specifies how
+		many times a cpu slab has been full and it has been refilled
+		by using a slab from the list of partially used slabs.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/alloc_refill
@@ -68,9 +66,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The alloc_refill file shows how many times the per-cpu freelist
-		was empty but there were objects available as the result of
-		remote cpu frees.  It can be written to clear the current count.
+		The alloc_refill file is read-only and specifies how many
+		times the per-cpu freelist was empty but there were objects
+		available as the result of remote cpu frees.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/alloc_slab
@@ -79,9 +77,8 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The alloc_slab file is shows how many times a new slab had to
-		be allocated from the page allocator.  It can be written to
-		clear the current count.
+		The alloc_slab file is read-only and specifies how many times
+		a new slab had to be allocated from the page allocator.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/alloc_slowpath
@@ -90,10 +87,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The alloc_slowpath file shows how many objects have been
-		allocated using the slow path because of a refill or
-		allocation from a partial or new slab.  It can be written to
-		clear the current count.
+		The alloc_slowpath file is read-only and specifies how many
+		objects have been allocated using the slow path because of a
+		refill or allocation from a partial or new slab.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/cache_dma
@@ -121,11 +117,10 @@ KernelVersion:	2.6.31
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The file cpuslab_flush shows how many times a cache's cpu slabs
-		have been flushed as the result of destroying or shrinking a
-		cache, a cpu going offline, or as the result of forcing an
-		allocation from a certain node.  It can be written to clear the
-		current count.
+		The file cpuslab_flush is read-only and specifies how many
+		times a cache's cpu slabs have been flushed as the result of
+		destroying or shrinking a cache, a cpu going offline, or as
+		the result of forcing an allocation from a certain node.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/ctor
@@ -144,8 +139,8 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The deactivate_empty file shows how many times an empty cpu slab
-		was deactivated.  It can be written to clear the current count.
+		The file deactivate_empty is read-only and specifies how many
+		times an empty cpu slab was deactivated.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/deactivate_full
@@ -154,8 +149,8 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The deactivate_full file shows how many times a full cpu slab
-		was deactivated.  It can be written to clear the current count.
+		The file deactivate_full is read-only and specifies how many
+		times a full cpu slab was deactivated.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/deactivate_remote_frees
@@ -164,9 +159,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The deactivate_remote_frees file shows how many times a cpu slab
-		has been deactivated and contained free objects that were freed
-		remotely.  It can be written to clear the current count.
+		The file deactivate_remote_frees is read-only and specifies how
+		many times a cpu slab has been deactivated and contained free
+		objects that were freed remotely.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/deactivate_to_head
@@ -175,9 +170,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The deactivate_to_head file shows how many times a partial cpu
-		slab was deactivated and added to the head of its node's partial
-		list.  It can be written to clear the current count.
+		The file deactivate_to_head is read-only and specifies how
+		many times a partial cpu slab was deactivated and added to the
+		head of its node's partial list.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/deactivate_to_tail
@@ -186,9 +181,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The deactivate_to_tail file shows how many times a partial cpu
-		slab was deactivated and added to the tail of its node's partial
-		list.  It can be written to clear the current count.
+		The file deactivate_to_tail is read-only and specifies how
+		many times a partial cpu slab was deactivated and added to the
+		tail of its node's partial list.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/destroy_by_rcu
@@ -206,9 +201,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The free_add_partial file shows how many times an object has
-		been freed in a full slab so that it had to added to its node's
-		partial list.  It can be written to clear the current count.
+		The file free_add_partial is read-only and specifies how many
+		times an object has been freed in a full slab so that it had to
+		added to its node's partial list.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/free_calls
@@ -227,9 +222,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The free_fastpath file shows how many objects have been freed
-		using the fast path because it was an object from the cpu slab.
-		It can be written to clear the current count.
+		The free_fastpath file is read-only and specifies how many
+		objects have been freed using the fast path because it was an
+		object from the cpu slab.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/free_frozen
@@ -238,9 +233,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The free_frozen file shows how many objects have been freed to
-		a frozen slab (i.e. a remote cpu slab).  It can be written to
-		clear the current count.
+		The free_frozen file is read-only and specifies how many
+		objects have been freed to a frozen slab (i.e. a remote cpu
+		slab).
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/free_remove_partial
@@ -249,10 +244,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The free_remove_partial file shows how many times an object has
-		been freed to a now-empty slab so that it had to be removed from
-		its node's partial list.  It can be written to clear the current
-		count.
+		The file free_remove_partial is read-only and specifies how
+		many times an object has been freed to a now-empty slab so
+		that it had to be removed from its node's partial list.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/free_slab
@@ -261,9 +255,8 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The free_slab file shows how many times an empty slab has been
-		freed back to the page allocator.  It can be written to clear
-		the current count.
+		The free_slab file is read-only and specifies how many times an
+		empty slab has been freed back to the page allocator.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/free_slowpath
@@ -272,9 +265,9 @@ KernelVersion:	2.6.25
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The free_slowpath file shows how many objects have been freed
-		using the slow path (i.e. to a full or partial slab).  It can
-		be written to clear the current count.
+		The free_slowpath file is read-only and specifies how many
+		objects have been freed using the slow path (i.e. to a full or
+		partial slab).
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/hwcache_align
@@ -353,10 +346,10 @@ KernelVersion:	2.6.26
 Contact:	Pekka Enberg <penberg@cs.helsinki.fi>,
 		Christoph Lameter <cl@linux-foundation.org>
 Description:
-		The order_fallback file shows how many times an allocation of a
-		new slab has not been possible at the cache's order and instead
-		fallen back to its minimum possible order.  It can be written to
-		clear the current count.
+		The file order_fallback is read-only and specifies how many
+		times an allocation of a new slab has not been possible at the
+		cache's order and instead fallen back to its minimum possible
+		order.
 		Available when CONFIG_SLUB_STATS is enabled.
 
 What:		/sys/kernel/slab/cache/partial

trunk/Documentation/cpu-freq/cpu-drivers.txt

@@ -92,9 +92,9 @@ policy->cpuinfo.max_freq -	the minimum and maximum frequency
 				(in kHz) which is supported by 
 				this CPU
 policy->cpuinfo.transition_latency   the time it takes on this CPU to
-				switch between two frequencies in
-				nanoseconds (if appropriate, else
-				specify CPUFREQ_ETERNAL)
+				switch between two frequencies (if
+				appropriate, else specify
+				CPUFREQ_ETERNAL)
 
 policy->cur			The current operating frequency of
 				this CPU (if appropriate)

trunk/Documentation/cpu-freq/user-guide.txt

@@ -203,17 +203,6 @@ scaling_cur_freq :		Current frequency of the CPU as determined by
 				the frequency the kernel thinks the CPU runs
 				at.
 
-bios_limit :			If the BIOS tells the OS to limit a CPU to
-				lower frequencies, the user can read out the
-				maximum available frequency from this file.
-				This typically can happen through (often not
-				intended) BIOS settings, restrictions
-				triggered through a service processor or other
-				BIOS/HW based implementations.
-				This does not cover thermal ACPI limitations
-				which can be detected through the generic
-				thermal driver.
-
 If you have selected the "userspace" governor which allows you to
 set the CPU operating frequency to a specific value, you can read out
 the current frequency in

trunk/Documentation/filesystems/ext3.txt

@@ -32,8 +32,8 @@ journal_dev=devnum	When the external journal device's major/minor numbers
 			identified through its new major/minor numbers encoded
 			in devnum.
 
-norecovery		Don't load the journal on mounting. Note that this forces
-noload			mount of inconsistent filesystem, which can lead to
+noload			Don't load the journal on mounting. Note that this forces
+			mount of inconsistent filesystem, which can lead to
 			various problems.
 
 data=journal		All data are committed into the journal prior to being

trunk/Documentation/filesystems/nilfs2.txt

@@ -49,7 +49,8 @@ Mount options
 NILFS2 supports the following mount options:
 (*) == default
 
-nobarrier		Disables barriers.
+barrier=on(*)		This enables/disables barriers. barrier=off disables
+			it, barrier=on enables it.
 errors=continue(*)	Keep going on a filesystem error.
 errors=remount-ro	Remount the filesystem read-only on an error.
 errors=panic		Panic and halt the machine if an error occurs.
@@ -70,10 +71,6 @@ order=strict		Apply strict in-order semantics that preserves sequence
 			blocks.  That means, it is guaranteed that no
 			overtaking of events occurs in the recovered file
 			system after a crash.
-norecovery		Disable recovery of the filesystem on mount.
-			This disables every write access on the device for
-			read-only mounts or snapshots.  This option will fail
-			for r/w mounts on an unclean volume.
 
 NILFS2 usage
 ============

trunk/Documentation/filesystems/vfs.txt

@@ -472,7 +472,7 @@ __sync_single_inode) to check if ->writepages has been successful in
 writing out the whole address_space.
 
 The Writeback tag is used by filemap*wait* and sync_page* functions,
-via filemap_fdatawait_range, to wait for all writeback to
+via wait_on_page_writeback_range, to wait for all writeback to
 complete.  While waiting ->sync_page (if defined) will be called on
 each page that is found to require writeback.