Messages in this thread | | | Date | Thu, 28 Mar 2013 15:28:57 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the signal tree with Linus' tree |
| |
Hi Al,
Today's linux-next merge of the signal tree got a conflict in fs/splice.c between commit 06ae43f34bcc ("Don't bother with redoing rw_verify_area() from default_file_splice_from()") from Linus' tree and commit 76b021d053ed ("convert vmsplice to COMPAT_SYSCALL_DEFINE") from the signal tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/splice.c index 29e394e,23ade0e..0000000 --- a/fs/splice.c +++ b/fs/splice.c @@@ -31,7 -31,7 +31,8 @@@ #include <linux/security.h> #include <linux/gfp.h> #include <linux/socket.h> + #include <linux/compat.h> +#include "internal.h" /* * Attempt to steal a page from a pipe buffer. This should perhaps go into [unhandled content-type:application/pgp-signature] | |