Hi Andrew, After merging the akpm tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/crypto/marvell/cesa.c: In function 'mv_cesa_get_sram': drivers/crypto/marvell/cesa.c:324:2: error: implicit declaration of function 'of_get_named_gen_pool' [-Werror=implicit-function-declaration] engine->pool = of_get_named_gen_pool(cesa->dev->of_node, ^ drivers/crypto/marvell/cesa.c:324:15: warning: assignment makes pointer from integer without a cast engine->pool = of_get_named_gen_pool(cesa->dev->of_node, ^ Caused by commit: f63601fd616a ("crypto: marvell/cesa - add a new driver for Marvell's CESA") from the crypto tree interacting with patch: "genalloc: rename of_get_named_gen_pool() to of_gen_pool_get()" from the akpm tree. I added this merge fix patch: From: Stephen Rothwell Date: Sun, 21 Jun 2015 00:23:08 +1000 Subject: [PATCH] crypto: marvell/cesa - fix up for of_get_named_gen_pool() rename Signed-off-by: Stephen Rothwell --- drivers/crypto/marvell/cesa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/marvell/cesa.c b/drivers/crypto/marvell/cesa.c index a432633bced4..1c6f98dd88f4 100644 --- a/drivers/crypto/marvell/cesa.c +++ b/drivers/crypto/marvell/cesa.c @@ -321,9 +321,8 @@ static int mv_cesa_get_sram(struct platform_device *pdev, int idx) const char *res_name = "sram"; struct resource *res; - engine->pool = of_get_named_gen_pool(cesa->dev->of_node, - "marvell,crypto-srams", - idx); + engine->pool = of_gen_pool_get(cesa->dev->of_node, + "marvell,crypto-srams", idx); if (engine->pool) { engine->sram = gen_pool_dma_alloc(engine->pool, cesa->sram_size, -- Cheers, Stephen Rothwell sfr@canb.auug.org.au