---

yaml --- r: 147037 b: refs/heads/master c: 2b1ccc0 h: refs/heads/master i: 147035: b95025f v: v3
git-mirror · May 12, 2009 · 1ea4aa6 · 1ea4aa6
1 parent 0a5411a
commit 1ea4aa6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e458824f9d32e9bf7700d1eb0d201749af48eee0
+refs/heads/master: 2b1ccc0ee918a653d0483fdad9dd6112ce8e9043
diff --git a/trunk/include/linux/splice.h b/trunk/include/linux/splice.h
@@ -11,8 +11,7 @@
 #include <linux/pipe_fs_i.h>
 
 /*
- * splice is tied to pipes as a transport (at least for now), so we'll just
- * add the splice flags here.
+ * Flags passed in from splice/tee/vmsplice
  */
 #define SPLICE_F_MOVE	(0x01)	/* move pages instead of copying */
 #define SPLICE_F_NONBLOCK (0x02) /* don't block on the pipe splicing (but */