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

[Olof Johansson]

On Sun, Jan 22, 2012 at 5:09 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.

I should cherry-pick in the same change as Herbert is carrying, and do
the rest of the fuse changes on top of that. I'll do that for
tomorrows -next.



-Olof
--
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/