Prev: linux-next: manual merge of the vfs tree with Linus' tree
Next: Western Union Alert!
From: Stephen Rothwell on 27 May 2010 21:50
Hi Al,

After merging the vfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/platforms/cell/spufs/file.c:1852: error: expected ';', ',' or ')' before 'int'
arch/powerpc/platforms/cell/spufs/file.c:1871: error: 'spufs_mfc_fsync' undeclared here (not in a function)

Caused by commit 05b2fc7d1f1046fef1199e1a4d2f63df998ef3aa ("drop unused
dentry argument to ->fsync").

My merge of the vfs tree was also bad because commit
facd07b07d2a7988f5ce849558838cc953847637 ("direct-io: add a hook for the
fs to provide its own submit_bio function") that entered Linus' tree in
the past 24 hours changed the prototype of __blockdev_direct_IO() and
that probably needs reflecting in the new __blockdev_direct_IO_newtrunc().

I have used the vfs tree from next-20100527 for today.
--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
From: Al Viro on 27 May 2010 22:00
On Fri, May 28, 2010 at 11:45:39AM +1000, Stephen Rothwell wrote:
> Hi Al,
>
> After merging the vfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> arch/powerpc/platforms/cell/spufs/file.c:1852: error: expected ';', ',' or ')' before 'int'
> arch/powerpc/platforms/cell/spufs/file.c:1871: error: 'spufs_mfc_fsync' undeclared here (not in a function)

Tpyo in fsync patch (missing comma in line 1852 there)

> Caused by commit 05b2fc7d1f1046fef1199e1a4d2f63df998ef3aa ("drop unused
> dentry argument to ->fsync").

> My merge of the vfs tree was also bad because commit
> facd07b07d2a7988f5ce849558838cc953847637 ("direct-io: add a hook for the
> fs to provide its own submit_bio function") that entered Linus' tree in
> the past 24 hours changed the prototype of __blockdev_direct_IO() and
> that probably needs reflecting in the new __blockdev_direct_IO_newtrunc().

OK, I'll rebase that stuff.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: linux-next: manual merge of the vfs tree with Linus' tree
Next: Western Union Alert!