On Mon, 2011-07-25 at 13:20 +1000, Stephen Rothwell wrote:
> Hi all,
>
> On Sat, 16 Jul 2011 16:44:04 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > After merging the vfs tree, today's linux-next build (powerpc
> > ppc64_defconfig) failed like this:
> >
> > fs/nfs/read.c: In function 'nfs_do_read':
> > fs/nfs/read.c:246:42: error: 'struct nfs_open_context' has no member named 'path'
> >
> > Caused by commit 6e4efd568574 ("NFS: Clean up nfs_read_rpcsetup and
> > nfs_write_rpcsetup") from the nfs tree interacting with commit
> > b98aad31afdc ("nfs_open_context doesn't need struct path either").
> >
> > I have applied the following merge fixup patch:
>
> This patch (repeasted here) is now required after mergeing the nfs tree
> and Linus' tree:
Thanks Stephen!
I've merged the contents of Linus' current tree into my NFS development
branch, and applied your patch as part of the merge commit.
Cheers
Trond
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
