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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20120507090427.GA26654@gondor.apana.org.au>
Date:	Mon, 7 May 2012 19:04:27 +1000
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	Stephen Rothwell <sfr@...b.auug.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 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

from my tree.

Cheers,
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
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/