Messages in this thread | | | Date | Wed, 27 Jan 2010 11:17:08 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the gfs2 tree with the vfs tree |
| |
Hi Steven,
Today's linux-next merge of the gfs2 tree got a conflict in fs/gfs2/super.c between commit 716c28c0bc8bcbdd26e819f38dfc8fdfaafc0289 ("pass writeback_control to ->write_inode") from the vfs tree and commit 56c79d55103b5d0943e063d036e7ebf8a7a1c21b ("GFS2: Wait for unlock completion on umount") from the gfs2 tree.
Just simple overlapping additions. I fixed up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/gfs2/super.c index effa35a,e2bf19f..0000000 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@@ -21,7 -21,7 +21,8 @@@ #include <linux/gfs2_ondisk.h> #include <linux/crc32.h> #include <linux/time.h> +#include <linux/writeback.h> + #include <linux/wait.h> #include "gfs2.h" #include "incore.h" [unhandled content-type:application/pgp-signature] | |