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

[Herbert Xu]

On Mon, Jan 23, 2012 at 12:09:33PM +1100, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got a conflict in
> arch/arm/mach-tegra/fuse.c between commit b2609c7c7237 ("ARM: tegra:
> fuse: add functions to access chip revision") from the tegra tree and
> commit e87e06cd8cc0 ("arm: tegra: export tegra_chip_uid") from the crypto
> tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks!

> By the way, adding the EXPORT_SYMBOL() really now only needs export.h not
> module.h (assuming that the crypto tree has a recent enough base).

OK noted.

Cheers,
-- 
Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/