The patch titled spufs: update ->flush method proto has been added to the -mm tree. Its filename is spufs-update-flush-method-proto.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: spufs: update ->flush method proto From: Al Viro <viro@xxxxxxxxxxxxxxxx> Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/powerpc/platforms/cell/spufs/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN arch/powerpc/platforms/cell/spufs/file.c~spufs-update-flush-method-proto arch/powerpc/platforms/cell/spufs/file.c --- a/arch/powerpc/platforms/cell/spufs/file.c~spufs-update-flush-method-proto +++ a/arch/powerpc/platforms/cell/spufs/file.c @@ -1150,7 +1150,7 @@ static unsigned int spufs_mfc_poll(struc return mask; } -static int spufs_mfc_flush(struct file *file) +static int spufs_mfc_flush(struct file *file, fl_owner_t id) { struct spu_context *ctx = file->private_data; int ret; @@ -1176,7 +1176,7 @@ out: static int spufs_mfc_fsync(struct file *file, struct dentry *dentry, int datasync) { - return spufs_mfc_flush(file); + return spufs_mfc_flush(file, NULL); } static int spufs_mfc_fasync(int fd, struct file *file, int on) _ Patches currently in -mm which might be from viro@xxxxxxxxxxxxxxxx are origin.patch spufs-update-flush-method-proto.patch kill-open-coded-offsetof-in-cm4000_csc-zero_dev.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html