lkml.org 
[lkml]   [2020]   [Mar]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the net-next tree with the net tree
Hi Vladimir,

[Sorry fr the slow response]

On Wed, 11 Mar 2020 11:50:17 +0200 Vladimir Oltean <olteanv@gmail.com> 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-03-19 06:01    [W:0.065 / U:0.892 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site