archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: James Morris <>
	Dmitry Kasatkin <>,
	Mimi Zohar <>,
	Ard Biesheuvel <>,
	Herbert Xu <>
Subject: linux-next: manual merge of the security tree with the  tree
Date: Mon, 28 Oct 2013 18:47:40 +1100	[thread overview]
Message-ID: <> (raw)

[-- 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 --]

             reply	other threads:[~2013-10-28  7:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-28  7:47 Stephen Rothwell [this message]
2013-10-29  8:37 ` linux-next: manual merge of the security tree with the tree Dmitry Kasatkin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).