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

David Miller
2015-03-24T03:00:03Z

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Mar 2015 13:45:08 +1100

> After merging the net-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> crypto/algif_skcipher.c: In function 'skcipher_async_cb':
> crypto/algif_skcipher.c:109:2: error: implicit declaration of function 'aio_complete' [-Werror=implicit-function-declaration]
> aio_complete(iocb, err, err);
> ^
>
> Caused by commit a596999b7ddf ("crypto: algif - change algif_skcipher
> to be asynchronous") interacting with commit 04b2fa9f8f36 ("fs: split
> generic and aio kiocb") from the vfs tree.
>
> I applied the following merge fix patch (which gets it building, but I
> am not sure if more is needed).

Ok, more conflicts wiht Al's vfs work.

This is starting to pile on, heavily...