linux-next: manual merge of the crypto tree with the kbuild tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the crypto tree got a conflict in:

  include/linux/crypto.h

between commit:

  c394d1683e7c ("cryptouser.h: fix include from userland")

from the kbuild tree and commit:

  f437a3f477cc ("crypto: api - Extend algorithm name limit to 128 bytes")

from the crypto tree.

I fixed it up (I used the former version of this file and added the
following merge fix patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Someone needs to remember to send this to Linus when these trees get
merged.

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 11 Apr 2017 10:16:43 +1000
Subject: [PATCH] crypto: merge fix for CRYPTO_MAX_ALG_NAME move

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 include/uapi/linux/crypto.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/crypto.h b/include/uapi/linux/crypto.h
index e342c5a5ac50..cfebf1d23d6a 100644
--- a/include/uapi/linux/crypto.h
+++ b/include/uapi/linux/crypto.h
@@ -9,6 +9,6 @@
 #ifndef _UAPI_CRYPTO_H
 #define _UAPI_CRYPTO_H
 
-#define CRYPTO_MAX_ALG_NAME		64
+#define CRYPTO_MAX_ALG_NAME		128
 
 #endif /* _UAPI_CRYPTO_H */
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell