From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Heiko Carstens <heiko.carstens@de•ibm.com>,
Vasily Gorbik <gor@linux•ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Waiman Long <longman@redhat•com>,
Harald Freudenberger <freude@linux•ibm.com>
Subject: linux-next: manual merge of the akpm-current tree with the s390 tree
Date: Mon, 6 Jul 2020 16:28:29 +1000 [thread overview]
Message-ID: <20200706162829.2fed3b5b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/s390/crypto/ap_bus.h
between commit:
74ecbef7b908 ("s390/zcrypt: code beautification and struct field renames")
from the s390 tree and commit:
a0062965cc01 ("mm, treewide: rename kzfree() to kfree_sensitive()")
from the akpm-current tree.
I fixed it up (see below) 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
diff --cc drivers/s390/crypto/ap_bus.h
index 1a1d5e3c8d45,823de10479bd..000000000000
--- a/drivers/s390/crypto/ap_bus.h
+++ b/drivers/s390/crypto/ap_bus.h
@@@ -219,8 -218,8 +219,8 @@@ static inline void ap_init_message(stru
*/
static inline void ap_release_message(struct ap_message *ap_msg)
{
- kzfree(ap_msg->msg);
- kzfree(ap_msg->private);
- kfree_sensitive(ap_msg->message);
++ kfree_sensitive(ap_msg->msg);
+ kfree_sensitive(ap_msg->private);
}
/*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-07-06 6:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 6:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-27 9:21 linux-next: manual merge of the akpm-current tree with the s390 tree Stephen Rothwell
2019-04-24 8:23 Stephen Rothwell
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=20200706162829.2fed3b5b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=freude@linux$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--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