---

yaml --- r: 284882 b: refs/heads/master c: a47161a h: refs/heads/master v: v3
git-mirror · Dec 2, 2011 · fb5f671 · fb5f671
1 parent a816fc0
commit fb5f671
Show file tree

Hide file tree

Showing 573 changed files with 7,858 additions and 9,389 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5627f65d6b860023f8ee985df61c20617dd21b5
+refs/heads/master: a47161a55e40203e5dae6d04df3b159551377365
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -688,13 +688,10 @@ S: Oxfordshire, UK.
 
 N: Kees Cook
 E: kees@outflux.net
-E: kees@ubuntu.com
-E: keescook@chromium.org
-W: http://outflux.net/blog/
-P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026
-D: Various security things, bug fixes, and documentation.
+W: http://outflux.net/
+P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D
+D: Minor updates to SCSI types, added /proc/pid/maps protection
 S: (ask for current address)
-S: Portland, Oregon
 S: USA
 
 N: Robin Cornelius

diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-rbd b/trunk/Documentation/ABI/testing/sysfs-bus-rbd
@@ -57,6 +57,13 @@ create_snap
 
 	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create
 
+rollback_snap
+
+	Rolls back data to the specified snapshot. This goes over the entire
+	list of rados blocks and sends a rollback command to each.
+
+	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback
+
 snap_*
 
 	A directory per each snapshot

diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt-nv24.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt-nv24.xml
diff --git a/trunk/Documentation/DocBook/media/v4l/pixfmt.xml b/trunk/Documentation/DocBook/media/v4l/pixfmt.xml
@@ -714,7 +714,6 @@ information.</para>
     &sub-nv12m;
     &sub-nv12mt;
     &sub-nv16;
-    &sub-nv24;
     &sub-m420;
   </section>