Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs tree

From: Jonathan Corbet <[email-masked]>
Date: Mon, 15 Apr 2019 07:45:20 -0600

On Mon, 15 Apr 2019 09:55:31 +0800
Alex Shi <[email-masked]> 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.

jon