From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jonathan Corbet <corbet@lwn.net>
Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs
 tree
Date: Mon, 15 Apr 2019 07:45:20 -0600
Message-ID: <20190415074520.4ca92d50@lwn.net>
References: <20190412110518.46e329af@canb.auug.org.au>
        <20190415110902.41c3c201@canb.auug.org.au>
        <a01e1602-3e82-f118-5fe4-1572647c06f9@linux.alibaba.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 8bit
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <a01e1602-3e82-f118-5fe4-1572647c06f9@linux.alibaba.com>
Sender: linux-kernel-owner@vger.kernel.org
To: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, Networking <netdev@vger.kernel.org>, David Miller <davem@davemloft.net>, Daniel Borkmann <daniel@iogearbox.net>, Alexei Starovoitov <ast@kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
List-Id: linux-next.vger.kernel.org

On Mon, 15 Apr 2019 09:55:31 +0800
Alex Shi <alex.shi@linux.alibaba.com> 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