linux-kernel - Re: linux-next: manual merge of the crypto tree with the sparc-next 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20120907033358.GB26360@gondor.apana.org.au>
Date:	Thu, 6 Sep 2012 20:33:58 -0700
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David McCullough <david_mccullough@...fee.com>,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: linux-next: manual merge of the crypto tree with the
 sparc-next tree

On Fri, Sep 07, 2012 at 12:51:04PM +1000, Stephen Rothwell wrote:
> Hi Herbert,
> 
> Today's linux-next merge of the crypto tree got conflicts in
> crypto/Kconfig between commits 4ff28d4ca93b ("sparc64: Add SHA1 driver
> making use of the 'sha1' instruction") and 9bf4852d3d19 ("sparc64: Add
> AES driver making use of the new aes opcodes") from the sparc-next tree
> and commit f0be44f4fb1f ("arm/crypto: Add optimized AES and SHA1
> routines") from the crypto tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good.  Thanks Stephen!
-- 
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
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/