Hi all,
On Fri, 24 Jul 2020 13:09:51 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the crypto tree got a conflict in:
>
> Documentation/crypto/api-intro.rst
>
> between commit:
>
> 5846551bb147 ("docs: crypto: convert api-intro.txt to ReST format")
>
> from the jc_docs tree and commit:
>
> 9332a9e73918 ("crypto: Replace HTTP links with HTTPS ones")
>
> from the crypto 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 Documentation/crypto/api-intro.rst
> index bcff47d42189,40137f93e04f..000000000000
> --- a/Documentation/crypto/api-intro.rst
> +++ b/Documentation/crypto/api-intro.rst
> @@@ -159,31 -146,31 +159,31 @@@ Credit
> The following people provided invaluable feedback during the development
> of the API:
>
> - Alexey Kuznetzov
> - Rusty Russell
> - Herbert Valerio Riedel
> - Jeff Garzik
> - Michael Richardson
> - Andrew Morton
> - Ingo Oeser
> - Christoph Hellwig
> + - Alexey Kuznetzov
> + - Rusty Russell
> + - Herbert Valerio Riedel
> + - Jeff Garzik
> + - Michael Richardson
> + - Andrew Morton
> + - Ingo Oeser
> + - Christoph Hellwig
>
> Portions of this API were derived from the following projects:
> -
> +
> Kerneli Cryptoapi (http://www.kerneli.org/)
> - Alexander Kjeldaas
> - Herbert Valerio Riedel
> - Kyle McMartin
> - Jean-Luc Cooke
> - David Bryson
> - Clemens Fruhwirth
> - Tobias Ringstrom
> - Harald Welte
> + - Alexander Kjeldaas
> + - Herbert Valerio Riedel
> + - Kyle McMartin
> + - Jean-Luc Cooke
> + - David Bryson
> + - Clemens Fruhwirth
> + - Tobias Ringstrom
> + - Harald Welte
>
> and;
> -
> +
> - Nettle (http://www.lysator.liu.se/~nisse/nettle/)
> + Nettle (https://www.lysator.liu.se/~nisse/nettle/)
> - Niels Möller
> + - Niels Möller
>
> Original developers of the crypto algorithms:
>
This is now a conflict between the jc_docs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpAxBnL6X8ho.pgp
Description: OpenPGP digital signature
