From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: linux-next: manual merge of the crypto tree with the kbuild tree
Date: Tue, 11 Apr 2017 10:21:19 +1000 [thread overview]
Message-ID: <20170411102119.102f4675@canb.auug.org.au> (raw)
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@canb.auug.org.au>
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@canb.auug.org.au>
---
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
next reply other threads:[~2017-04-11 0:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 0:21 Stephen Rothwell [this message]
2017-04-11 2:42 ` linux-next: manual merge of the crypto tree with the kbuild tree Herbert Xu
2017-04-11 5:02 ` Stephen Rothwell
2017-04-11 5:12 ` Herbert Xu
2017-04-11 6:34 ` Masahiro Yamada
2017-04-11 6:40 ` Herbert Xu
2017-04-11 7:00 ` Masahiro Yamada
2017-04-11 7:19 ` Herbert Xu
2017-04-11 7:51 ` Masahiro Yamada
2017-04-11 9:22 ` Herbert Xu
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170411102119.102f4675@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.