From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Herbert Xu <herbert@gondor•apana.org.au>,
Linux Crypto List <linux-crypto@vger•kernel.org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Ard Biesheuvel <ardb@kernel•org>,
Waiman Long <longman@redhat•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the crypto tree
Date: Tue, 4 Aug 2020 08:12:47 +1000 [thread overview]
Message-ID: <20200804081247.1b686608@canb.auug.org.au> (raw)
In-Reply-To: <20200717201411.3f1b8417@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2020-08-03 22:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20200804081247.1b686608@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=ardb@kernel$(echo .)org \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=longman@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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