Subject: Re: linux-next: manual merge of the nfs tree with Linus' tree

From: David Howells <[email-masked]>
Date: Thu, 02 Apr 2009 09:56:37 +0100

Stephen Rothwell <[email-masked]> wrote:

>  -static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct page *page)
>  +static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

That is the correct fix.  I've it to my version of the patch.

David