[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <201205070809.21709.arnd@arndb.de>
Date: Mon, 7 May 2012 08:09:21 +0000
From: Arnd Bergmann <arnd@...db.de>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Herbert Xu <herbert@...dor.apana.org.au>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Andreas Westin <andreas.westin@...ricsson.com>,
Linus Walleij <linus.walleij@...aro.org>,
Lee Jones <lee.jones@...aro.org>
Subject: Re: linux-next: manual merge of the crypto tree with Linus' tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists