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

[Linus Walleij]

On Mon, May 7, 2012 at 11:04 AM, Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote:
> On Mon, May 07, 2012 at 08:09:21AM +0000, Arnd Bergmann wrote:
>> 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.
>
> OK, I'll drop the last patch
>
>        mach-ux500: crypto - core support for CRYP/HASH module

OK we need to revisit this and we can drop the U5500 hunks at
the same time.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/