---

yaml
---
r: 154539
b: refs/heads/master
c: 0c405b3
h: refs/heads/master
i:
  154537: e5829a1
  154535: bbe6432
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa221cb61792b941234ab458020c93ed97810161
+refs/heads/master: 0c405b3346ea08098a82a1ee82912b018dfa9f96

trunk/Documentation/filesystems/Locking

@@ -109,28 +109,27 @@ prototypes:
 
 locking rules:
 	All may block.
-	None have BKL
-			s_umount
-alloc_inode:
-destroy_inode:
-dirty_inode:				(must not sleep)
-write_inode:
-drop_inode:				!!!inode_lock!!!
-delete_inode:
-put_super:		write
-write_super:		read
-sync_fs:		read
-freeze_fs:		read
-unfreeze_fs:		read
-statfs:			no
-remount_fs:		maybe		(see below)
-clear_inode:
-umount_begin:		no
-show_options:		no		(namespace_sem)
-quota_read:		no		(see below)
-quota_write:		no		(see below)
-
-->remount_fs() will have the s_umount exclusive lock if it's already mounted.
+			BKL	s_lock	s_umount
+alloc_inode:		no	no	no
+destroy_inode:		no
+dirty_inode:		no				(must not sleep)
+write_inode:		no
+drop_inode:		no				!!!inode_lock!!!
+delete_inode:		no
+put_super:		yes	yes	no
+write_super:		no	yes	read
+sync_fs:		no	no	read
+freeze_fs:		?
+unfreeze_fs:		?
+statfs:			no	no	no
+remount_fs:		yes	yes	maybe		(see below)
+clear_inode:		no
+umount_begin:		yes	no	no
+show_options:		no				(vfsmount->sem)
+quota_read:		no	no	no		(see below)
+quota_write:		no	no	no		(see below)
+
+->remount_fs() will have the s_umount lock if it's already mounted.
 When called from get_sb_single, it does NOT have the s_umount lock.
 ->quota_read() and ->quota_write() functions are both guaranteed to
 be the only ones operating on the quota file by the quota code (via

trunk/Documentation/kernel-parameters.txt

@@ -229,6 +229,14 @@ and is between 256 and 4096 characters. It is defined in the file
 			to assume that this machine's pmtimer latches its value
 			and always returns good values.
 
+ 	acpi.power_nocheck=	[HW,ACPI]
+ 			Format: 1/0 enable/disable the check of power state.
+ 			On some bogus BIOS the _PSC object/_STA object of
+ 			power resource can't return the correct device power
+ 			state. In such case it is unneccessary to check its
+ 			power state again in power transition.
+ 			1 : disable the power state check
+
 	acpi_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode
 			Format: { level | edge | high | low }
 
@@ -1855,7 +1863,7 @@ and is between 256 and 4096 characters. It is defined in the file
 				IRQ routing is enabled.
 		noacpi		[X86] Do not use ACPI for IRQ routing
 				or for PCI scanning.
-		use_crs		[X86] Use _CRS for PCI resource
+		nocrs		[X86] Don't use _CRS for PCI resource
 				allocation.
 		routeirq	Do IRQ routing for all PCI devices.
 				This is normally done in pci_enable_device(),
@@ -1915,12 +1923,6 @@ and is between 256 and 4096 characters. It is defined in the file
 			Format: { 0 | 1 }
 			See arch/parisc/kernel/pdc_chassis.c
 
-	percpu_alloc=	[X86] Select which percpu first chunk allocator to use.
-			Allowed values are one of "lpage", "embed" and "4k".
-			See comments in arch/x86/kernel/setup_percpu.c for
-			details on each allocator.  This parameter is primarily
-			for debugging and performance comparison.
-
 	pf.		[PARIDE]
 			See Documentation/blockdev/paride.txt.
 
@@ -2473,8 +2475,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	tp720=		[HW,PS2]
 
-	trace_buf_size=nn[KMG]
-			[FTRACE] will set tracing buffer size.
+	trace_buf_size=nn[KMG] [ftrace] will set tracing buffer size.
 
 	trix=		[HW,OSS] MediaTrix AudioTrix Pro
 			Format: