---

yaml
---
r: 221813
b: refs/heads/master
c: cf38d0b
h: refs/heads/master
i:
  221811: 9b7e16c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28397babba4d2bb4a529859dd1f4fb9a0beb3e48
+refs/heads/master: cf38d0ba7efdc476815768b2b999b27cfae69747

trunk/Documentation/filesystems/Locking

@@ -322,13 +322,15 @@ fl_release_private:	yes	yes
 prototypes:
 	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
 	void (*fl_notify)(struct file_lock *);  /* unblock callback */
+	void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
 	void (*fl_release_private)(struct file_lock *);
 	void (*fl_break)(struct file_lock *); /* break_lease callback */
 
 locking rules:
 			BKL	may block
 fl_compare_owner:	yes	no
 fl_notify:		yes	no
+fl_copy_lock:		yes	no
 fl_release_private:	yes	yes
 fl_break:		yes	no
 

trunk/Documentation/filesystems/xfs-delayed-logging-design.txt

@@ -794,6 +794,17 @@ designed.
 
 Roadmap:
 
+2.6.37 Remove experimental tag from mount option
+	=> should be roughly 6 months after initial merge
+	=> enough time to:
+		=> gain confidence and fix problems reported by early
+		   adopters (a.k.a. guinea pigs)
+		=> address worst performance regressions and undesired
+		   behaviours
+		=> start tuning/optimising code for parallelism
+		=> start tuning/optimising algorithms consuming
+		   excessive CPU time
+
 2.6.39 Switch default mount option to use delayed logging
 	=> should be roughly 12 months after initial merge
 	=> enough time to shake out remaining problems before next round of

trunk/Documentation/i2c/busses/i2c-i801

@@ -15,14 +15,10 @@ Supported adapters:
   * Intel 82801I (ICH9)
   * Intel EP80579 (Tolapai)
   * Intel 82801JI (ICH10)
-  * Intel 5/3400 Series (PCH)
+  * Intel 3400/5 Series (PCH)
   * Intel Cougar Point (PCH)
-  * Intel Patsburg (PCH)
    Datasheets: Publicly available at the Intel website
 
-On Intel Patsburg and later chipsets, both the normal host SMBus controller
-and the additional 'Integrated Device Function' controllers are supported.
-
 Authors: 
 	Mark Studebaker <mdsxyz123@yahoo.com>
 	Jean Delvare <khali@linux-fr.org>

trunk/Documentation/leds-class.txt

@@ -60,18 +60,15 @@ Hardware accelerated blink of LEDs
 
 Some LEDs can be programmed to blink without any CPU interaction. To
 support this feature, a LED driver can optionally implement the
-blink_set() function (see <linux/leds.h>). To set an LED to blinking,
-however, it is better to use use the API function led_blink_set(),
-as it will check and implement software fallback if necessary.
-
-To turn off blinking again, use the API function led_brightness_set()
-as that will not just set the LED brightness but also stop any software
-timers that may have been required for blinking.
-
-The blink_set() function should choose a user friendly blinking value
-if it is called with *delay_on==0 && *delay_off==0 parameters. In this
-case the driver should give back the chosen value through delay_on and
-delay_off parameters to the leds subsystem.
+blink_set() function (see <linux/leds.h>). If implemented, triggers can
+attempt to use it before falling back to software timers. The blink_set()
+function should return 0 if the blink setting is supported, or -EINVAL
+otherwise, which means that LED blinking will be handled by software.
+
+The blink_set() function should choose a user friendly blinking
+value if it is called with *delay_on==0 && *delay_off==0 parameters. In
+this case the driver should give back the chosen value through delay_on
+and delay_off parameters to the leds subsystem.
 
 Setting the brightness to zero with brightness_set() callback function
 should completely turn off the LED and cancel the previously programmed

trunk/Documentation/scsi/ChangeLog.megaraid_sas

@@ -1,50 +1,3 @@
-1 Release Date    : Thur.  May 03, 2010 09:12:45 PST 2009 -
-			(emaild-id:megaraidlinux@lsi.com)
-			Bo Yang
-
-2 Current Version : 00.00.04.31-rc1
-3 Older Version   : 00.00.04.17.1-rc1
-
-1.	Add the Online Controller Reset (OCR) to the Driver.
-	OCR is the new feature for megaraid_sas driver which
-	will allow the fw to do the chip reset which will not
-	affact the OS behavious.
-
-	To add the OCR support, driver need to do:
-		a). reset the controller chips -- Xscale and Gen2 which
-		will change the function calls and add the reset function
-		related to this two chips.
-
-		b). during the reset, driver will store the pending cmds
-		which not returned by FW to driver's pending queue.  Driver
-		will re-issue those pending cmds again to FW after the OCR
-		finished.
-
-		c). In driver's timeout routine, driver will report to
-		OS as reset. Also driver's queue routine will block the
-		cmds until the OCR finished.
-
-		d). in Driver's ISR routine, if driver get the FW state as
-		state change, FW in Failure status and FW support online controller
-		reset (OCR), driver will start to do the controller reset.
-
-		e). In driver's IOCTL routine, the application cmds will wait for the
-		OCR to finish, then issue the cmds to FW.
-
-		f). Before driver kill adapter, driver will do last chance of
-		OCR to see if driver can bring back the FW.
-
-2.	Add the support update flag to the driver to tell LSI megaraid_sas
-	application which driver will support the device update.  So application
-	will not need to do the device update after application add/del the device
-	from the system.
-3.	In driver's timeout routine, driver will do three time reset if fw is in
-	failed state.  Driver will kill adapter if can't bring back FW after the
-	this three times reset.
-4.	Add the input parameter max_sectors to 1MB support to our GEN2 controller.
-	customer can use the input paramenter max_sectors to add 1MB support to GEN2
-	controller.
-
 1 Release Date    : Thur.  Oct 29, 2009 09:12:45 PST 2009 -
 			(emaild-id:megaraidlinux@lsi.com)
 			Bo Yang

trunk/Documentation/sysctl/kernel.txt

@@ -28,7 +28,6 @@ show up in /proc/sys/kernel:
 - core_uses_pid
 - ctrl-alt-del
 - dentry-state
-- dmesg_restrict
 - domainname
 - hostname
 - hotplug
@@ -214,19 +213,6 @@ to decide what to do with it.
 
 ==============================================================
 
-dmesg_restrict:
-
-This toggle indicates whether unprivileged users are prevented from using
-dmesg(8) to view messages from the kernel's log buffer.  When
-dmesg_restrict is set to (0) there are no restrictions.  When
-dmesg_restrict is set set to (1), users must have CAP_SYS_ADMIN to use
-dmesg(8).
-
-The kernel config option CONFIG_SECURITY_DMESG_RESTRICT sets the default
-value of dmesg_restrict.
-
-==============================================================
-
 domainname & hostname:
 
 These files can be used to set the NIS/YP domainname and the

trunk/MAINTAINERS

@@ -1757,7 +1757,6 @@ L:	linux-cris-kernel@axis.com
 W:	http://developer.axis.com
 S:	Maintained
 F:	arch/cris/
-F:	drivers/serial/crisv10.*
 
 CRYPTO API
 M:	Herbert Xu <herbert@gondor.apana.org.au>

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 37
-EXTRAVERSION = -rc1
+SUBLEVEL = 36
+EXTRAVERSION =
 NAME = Flesh-Eating Bats with Fangs
 
 # *DOCUMENTATION*

trunk/arch/arm/mach-shmobile/Kconfig

@@ -116,6 +116,4 @@ endmenu
 config SH_CLK_CPG
 	bool
 
-source "drivers/sh/Kconfig"
-
 endif