linux-kernel - linux-next: manual merge of the sh tree with the sh-current 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>] [day] [month] [year] [list]

Message-Id: <20101227094546.63f76577.sfr@canb.auug.org.au>
Date:	Mon, 27 Dec 2010 09:45:46 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Mundt <lethal@...ux-sh.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the sh tree with the sh-current tree

Hi Paul,

Today's linux-next merge of the sh tree got a conflict in
arch/sh/kernel/cpu/sh2a/clock-sh7201.c between commit
27f1acccd4d310e941d2e879445324595e2fe463 ("sh: Fix up SH7201 clkfwk
build") from the sh-current tree and commit
16b259203c513ed28bd31cc9a981e0d3ad517943 ("sh: migrate SH_CLK_MD to mode
pin API") from the sh tree.

The latter includes the fix from the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped