* linux-next: manual merge of the akpm-current tree with the crypto tree
@ 2020-07-17 10:14 Stephen Rothwell
2020-08-03 22:12 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-07-17 10:14 UTC (permalink / raw)
To: Andrew Morton, Herbert Xu, Linux Crypto List
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Ard Biesheuvel, Waiman Long
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/crypto/mediatek/mtk-aes.c
between commit:
f441ba2ad341 ("crypto: mediatek - use AES library for GCM key derivation")
from the crypto tree and commit:
161f6a5cc3ea ("mm, treewide: rename kzfree() to kfree_sensitive()")
from the akpm-current tree.
I fixed it up (the former removed the code updated by the latter) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the crypto tree
2020-07-17 10:14 linux-next: manual merge of the akpm-current tree with the crypto tree Stephen Rothwell
@ 2020-08-03 22:12 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-08-03 22:12 UTC (permalink / raw)
To: Andrew Morton, Herbert Xu, Linux Crypto List
Cc: Linux Next Mailing List, Linux Kernel Mailing List,
Ard Biesheuvel, Waiman Long
[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]
Hi all,
On Fri, 17 Jul 2020 20:14:11 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/crypto/mediatek/mtk-aes.c
>
> between commit:
>
> f441ba2ad341 ("crypto: mediatek - use AES library for GCM key derivation")
>
> from the crypto tree and commit:
>
> 161f6a5cc3ea ("mm, treewide: rename kzfree() to kfree_sensitive()")
>
> from the akpm-current tree.
>
> I fixed it up (the former removed the code updated by the latter) 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.
This is now a conflict between the akmp-current tree and Linus' tre.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-03 22:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-17 10:14 linux-next: manual merge of the akpm-current tree with the crypto tree Stephen Rothwell
2020-08-03 22:12 ` Stephen Rothwell
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).