crypto: engine: fix linux-next merge conflict
authorArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2016 10:36:35 +0000 (20:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 03:57:02 +0000 (13:57 +1000)
commite85da17e84787605e1944bcf13254a8a94e006da
tree998ff14433ad92b6a9fab4da2b0af2d20ae0d499
parent8c03cbe6ff2fd1c727514550d01f07d7a7d36060
crypto: engine: fix linux-next merge conflict

A merge conflict between the akpm-current tree and the crypto tree
caused a build failure in ARM allmodconfig today:

crypto/crypto_engine.c: In function 'crypto_transfer_hash_request':
crypto/crypto_engine.c:234:3: error: implicit declaration of function 'queue_kthread_work' [-Werror=implicit-function-declaration]

This adapts the crypto code to the API change.

Fixes: 4cba7cf025f3 ("crypto: engine - permit to enqueue ashash_request")
Fixes: 8ca76638a2d0 ("kthread: kthread worker API cleanup")
Link: http://lkml.kernel.org/r/20160908135724.1311726-1-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
crypto/crypto_engine.c
This page took 0.024536 seconds and 5 git commands to generate.