diff --git a/[refs] b/[refs] index 4842f8b3e9ea..957b5bde6b7b 100644 --- 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 index 5f3faa9d15ae..18e7c7c0cae6 100644 --- a/trunk/include/linux/splice.h +++ b/trunk/include/linux/splice.h @@ -11,8 +11,7 @@ #include /* - * 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 */