linux-kernel - Re: linux-next: manual merge of the crypto tree with the tegra 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: <CAOesGMgH0owngSkJq72Wf01Z7YSsD9pzRZWtzSvZt+Q7ZA6qng@mail.gmail.com>
Date:	Sun, 22 Jan 2012 20:24:16 -0800
From:	Olof Johansson <olof@...om.net>
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,
	Henning Heinold <heinold@....fu-berlin.de>,
	Varun Wadekar <vwadekar@...dia.com>,
	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>
Subject: Re: linux-next: manual merge of the crypto tree with the tegra tree

On Sun, Jan 22, 2012 at 5:09 PM, Stephen Rothwell <sfr@...b.auug.org.au> 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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/