From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
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: Re: linux-next: manual merge of the crypto tree with the kbuild tree
Date: Tue, 11 Apr 2017 16:51:08 +0900 [thread overview]
Message-ID: <CAK7LNAQgXTZ2We3KXb1OuUDWUP=RmMfVAVGLBZ3xVqKhZH_Y4w@mail.gmail.com> (raw)
In-Reply-To: <20170411150250.49996951@canb.auug.org.au>
Hi Linus, Stephen,
2017-04-11 14:02 GMT+09:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Herbert,
>
> On Tue, 11 Apr 2017 10:42:15 +0800 Herbert Xu <herbert@gondor.apana.org.au> wrote:
>>
>> Actually the patch in the kbuild tree should be reverted because
>> we have now increased the in-kernel length limit and this must not
>> be directly exposed to user-space or it'll break compatibility.
>
> So basically we need CRYPTO_MAX_ALG_NAME to be 64 in the exported
> header but 128 in the kernel header? In which case the kbuild patch
> needs to be changed not removed. Or the merge resolution needs to be
> cleverer.
In the development cycle for 4.12-rc1, some patches
from Kbuild cause conflicts in linux-next from time to time.
The patches in linux-kbuild/uapi branch touched some files
in other subsystems because they are prerequisites
to export the uapi directory as-is.
Most of the conflicts are trivial to fix-up,
and they are handled nicely thanks to Stephen.
But, today's one is hard:
https://lkml.org/lkml/2017/4/10/1208
As Herbert suggested, the easiest way is to revert
c394d1683, but reverting it will cause an error in Kbuild tree:
.../linux/cryptouser.h:58:16: error: ‘CRYPTO_MAX_ALG_NAME’ undeclared
here (not in a function)
So, I will rebase the linux-kbuild/uapi branch onto Linus's tree
(resolving all conflicts) after crypto changes are pulled
during the next merge window.
Then, I will send the kbuild/uapi pull request so that Linus can pull
it with no (less) conflicts.
The commit c394d1683 will effectively be dropped.
I think this is the cleanest way to fix the issue.
Please let me know if you see problems in this plan.
Thanks.
--
Best Regards
Masahiro Yamada
next prev parent reply other threads:[~2017-04-11 7:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-11 0:21 linux-next: manual merge of the crypto tree with the kbuild tree Stephen Rothwell
2017-04-11 2:42 ` 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 [this message]
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='CAK7LNAQgXTZ2We3KXb1OuUDWUP=RmMfVAVGLBZ3xVqKhZH_Y4w@mail.gmail.com' \
--to=yamada.masahiro@socionext.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/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.