Re: linux-next: manual merge of the net-next tree with the net tree

[Stephen Rothwell]

Hi Vladimir,

[Sorry fr the slow response]

On Wed, 11 Mar 2020 11:50:17 +0200 Vladimir Oltean <olteanv@xxxxxxxxx> wrote:
>
> What would be the takeaway here? I did bring the fact that it will
> conflict to David's attention here, not sure what else should have
> been done:
> https://www.spinics.net/lists/netdev/msg636207.html
> The conflict resolution looks fine btw, I've tested linux-next and it
> also works.

David has now merged the two trees and resolved this.  My notification
is just so that people are aware of conflicts in separate trees that
usually only come together in Linus' tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgphDNaAr_JBz.pgp
Description: OpenPGP digital signature