archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the security tree with the  tree
@ 2013-10-28  7:47 Stephen Rothwell
  2013-10-29  8:37 ` Dmitry Kasatkin
  0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-10-28  7:47 UTC (permalink / raw)
  To: James Morris
  Cc: linux-next, linux-kernel, Dmitry Kasatkin, Mimi Zohar,
	Ard Biesheuvel, Herbert Xu

[-- Attachment #1: Type: text/plain, Size: 897 bytes --]

Hi James,

Today's linux-next merge of the security tree got a conflict in
crypto/Makefile between commit a62b01cd6cc1 ("crypto: create generic
version of ablk_helper") from the crypto tree and commit ee08997fee16
("crypto: provide single place for hash algo information") from the
security tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Stephen Rothwell          

diff --cc crypto/Makefile
index e0b7cf4e18b6,b3a7e807e08b..000000000000
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@@ -109,4 -104,4 +109,5 @@@ obj-$(CONFIG_CRYPTO_USER_API_SKCIPHER) 
  obj-$(CONFIG_XOR_BLOCKS) += xor.o
  obj-$(CONFIG_ASYNC_CORE) += async_tx/
  obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
 +obj-$(CONFIG_CRYPTO_ABLK_HELPER) += ablk_helper.o
+ obj-$(CONFIG_CRYPTO_HASH_INFO) += hash_info.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-10-29  8:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-28  7:47 linux-next: manual merge of the security tree with the tree Stephen Rothwell
2013-10-29  8:37 ` Dmitry Kasatkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).