[lkml]   [2019]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the bpf-next tree with the jc_docs tree
On Mon, 15 Apr 2019 09:55:31 +0800
Alex Shi <> wrote:

> > This is now a conflict between the net-next tree and the jc_docs tree.
> Sorry, Stephen, What I can do for this?

What you can do is to not worry. A trivial conflict like this is easily
handled when everything goes upsteam.


 \ /
  Last update: 2019-04-15 15:46    [W:0.034 / U:0.780 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site