linux-kernel - linux-next: manual merge of the galak tree with the powerpc-merge 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: <20100903111202.6529b9c4.sfr@canb.auug.org.au>
Date:	Fri, 3 Sep 2010 11:12:02 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kumar Gala <galak@...nel.crashing.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexander Graf <agraf@...e.de>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Paul Mackerras <paulus@...ba.org>,
	<linuxppc-dev@...ts.ozlabs.org>
Subject: linux-next: manual merge of the galak tree with the powerpc-merge
 tree

Hi Kumar,

Today's linux-next merge of the galak tree got a conflict in
arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit
6d4f2fb0860c36e7ef16cc41126242a8b6542771 ("powerpc/85xx: Fix compilation
of mpc85xx_mds.c") from the powerpc-merge tree and commit
5dc45967402dd124980fce88d34d7f4a012a381b ("powerpc/85xx: Fix compile
error in mpc85xx_mds.c") from the galak tree.

I used the version in the powerpc-merge tree as the inititalisation of np
is unnecessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped