From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Waiman Long <longman@redhat.com>, Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the akpm-current tree with the net-next tree
Date: Tue, 21 Jul 2020 19:47:39 +1000 [thread overview]
Message-ID: <20200721194739.4cac3da4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
net/sctp/socket.c
between commits:
89fae01eef8b ("sctp: switch sctp_setsockopt_auth_key to use memzero_explicit")
534d13d07e77 ("sctp: pass a kernel pointer to sctp_setsockopt_auth_key")
from the net-next tree and commit:
f08cd4915bb1 ("mm, treewide: rename kzfree() to kfree_sensitive()")
from the akpm-current tree.
I fixed it up (I just used the net-next tree version) 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 --]
next reply other threads:[~2020-07-21 9:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 9:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-05 4:10 Stephen Rothwell
2020-07-13 8:20 Stephen Rothwell
2019-07-03 8:40 Stephen Rothwell
2019-06-07 5:44 Stephen Rothwell
2019-05-06 10:43 Stephen Rothwell
2019-05-06 14:42 ` Andy Shevchenko
2017-11-03 8:07 Stephen Rothwell
2017-11-02 7:52 Stephen Rothwell
2017-09-05 5:27 Stephen Rothwell
2015-12-17 5:31 Stephen Rothwell
2015-12-10 4:54 Stephen Rothwell
2015-02-09 9:31 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=20200721194739.4cac3da4@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=longman@redhat.com \
--cc=netdev@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®