Messages in this thread | | | Date | Thu, 4 Apr 2013 17:12:11 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the vfs tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in mm/filemap.c, fs/xfs/xfs_file.c, fs/splice.c, fs/ocfs2/file.c, fs/ntfs/file.c, fs/fuse/file.c, fs/cifs/file.c and fs/btrfs/file.c between commit 36bd5dc0c4e2 ("lift sb_start_write/sb_end_write out of ->aio_write()") from the vfs tree and commit "fs: return EAGAIN when O_NONBLOCK write should block on frozen fs" from the akpm tree.
The former was removing the code modified by the letter, so I just dropped the akpm tree patch and the following "ocfs2: add freeze protection to ocfs2_file_splice_write()".
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |