On Sun, Jan 22, 2012 at 5:09 PM, Stephen Rothwell [off-list ref] 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