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

From: Arnd Bergmann <[email-masked]>
Date: Mon, 7 May 2012 08:09:21 +0000

On Monday 07 May 2012, Stephen Rothwell wrote:
> + static void __init u8500_cryp1_hash1_init(void)
> + {
> +       db8500_add_cryp1(&u8500_cryp1_platform_data);
> +       db8500_add_hash1(&u8500_hash1_platform_data);
> + }

This is actually not correct any more because of the
other changes: each device addition should also pass the parent
pointer so the device is created in the right position.

Stephen, your fix is ok for linux-next and I expect everything
to still work, but we should not merge it into v3.5 this way.

Thanks for the fixup.

	Arnd