Re: linux-next: build failure after merge of the nfs tree

[Trond Myklebust]

Hi Stephen,

On Thu, Jan 7, 2016 at 7:14 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Trond,
>
> After merging the nfs tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> write.c:(.text+0xa60): multiple definition of `nfs_wait_atomic_killable'
> fs/nfs/inode.o:inode.c:(.text+0x20a4): first defined here
>
> Caused by commit
>
>   fa5cca9f3334 ("NFS: Use wait_on_atomic_t() for unlock after readahead")
>
> I have used the nfs tree from next-20160107 for today.
>

I just finished fixing that up. :-) Apologies for not catching it
earlier. It was an integration issue in my own tree.

Cheers
  Trond