From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Herbert Xu <herbert@gondor.apana.org.au>,
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>,
Krzysztof Kozlowski <krzk@kernel.org>
Subject: Re: linux-next: manual merge of the crypto tree with the net-next tree
Date: Wed, 15 Aug 2018 13:12:46 +1000 [thread overview]
Message-ID: <20180815131246.67214bdf@canb.auug.org.au> (raw)
In-Reply-To: <20180730132253.33633f56@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1202 bytes --]
Hi all,
On Mon, 30 Jul 2018 13:22:53 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the crypto tree got conflicts in:
>
> drivers/net/ethernet/freescale/fec_main.c
> drivers/net/ethernet/freescale/fs_enet/mac-fec.c
>
> between commits:
>
> 16f6e9835bcd ("net: ethernet: freescale: Use generic CRC32 implementation")
> d805f6a86829 ("net: ethernet: fs-enet: Use generic CRC32 implementation")
>
> from the net-next tree and commit:
>
> 5d258b48efbd ("net: ethernet: Use existing define with polynomial")
>
> from the crypto tree.
>
> I fixed it up (I used the net-next tree versions (but kept the rmeoval
> of the CRC32_POLY and FEC_CRC_POLY defines) 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 crypto-current tree and the net-next
tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]
next prev parent reply other threads:[~2018-08-15 3:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 3:22 linux-next: manual merge of the crypto tree with the net-next tree Stephen Rothwell
2018-07-31 6:24 ` Krzysztof Kozlowski
2018-08-15 3:12 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-03-30 0:42 Stephen Rothwell
2020-03-30 0:49 ` Herbert Xu
2020-03-30 15:35 ` Ayush Sawal
2018-01-25 10:52 Stephen Rothwell
2016-03-07 2:18 Stephen Rothwell
2016-03-07 11:08 ` David Howells
2016-03-08 5:56 ` Stephen Rothwell
2016-03-08 16:48 ` David Howells
2016-03-08 21:22 ` Stephen Rothwell
2013-02-06 2:20 Stephen Rothwell
2013-02-06 5:45 ` 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=20180815131246.67214bdf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).