From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
Linux Crypto List <linux-crypto@vger.kernel.org>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the crypto tree with Linus' tree
Date: Tue, 15 Jun 2021 11:39:32 +1000 [thread overview]
Message-ID: <20210615113932.322a3186@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 880 bytes --]
Hi all,
Today's linux-next merge of the crypto tree got a conflict in:
drivers/crypto/cavium/nitrox/nitrox_main.c
between commit:
6a3239a738d8 ("Revert "crypto: cavium/nitrox - add an error message to explain the failure of pci_request_mem_regions"")
from Linus' tree and commit:
0dc64297c8ac ("crypto: cavium/nitrox - Fix an error rhandling path in 'nitrox_probe()'")
from the crypto tree.
I fixed it up (I just used the latter since it also did what the former
did) 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:[~2021-06-15 2:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-15 1:39 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 1:52 linux-next: manual merge of the crypto tree with Linus' tree Stephen Rothwell
2020-09-21 2:36 Stephen Rothwell
2020-05-11 3:23 Stephen Rothwell
2019-11-05 2:23 Stephen Rothwell
2019-08-23 3:08 Stephen Rothwell
2019-08-23 3:25 ` Nick Desaulniers
2019-06-11 2:07 Stephen Rothwell
2019-06-03 0:52 Stephen Rothwell
2014-05-09 2:07 Stephen Rothwell
2014-05-09 12:51 ` Herbert Xu
2014-04-17 2:57 Stephen Rothwell
2014-04-17 2:49 Stephen Rothwell
2012-05-07 2:31 Stephen Rothwell
2012-05-07 4:20 ` Herbert Xu
2012-05-07 2:11 Stephen Rothwell
2012-05-07 4:16 ` Herbert Xu
2012-05-07 8:09 ` Arnd Bergmann
2012-05-07 9:04 ` Herbert Xu
2012-05-07 11:02 ` Linus Walleij
2010-04-14 1:48 Stephen Rothwell
2010-04-14 3:14 ` 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=20210615113932.322a3186@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christophe.jaillet@wanadoo.fr \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@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;
as well as URLs for NNTP newsgroup(s).