From: Jonathan Corbet <corbet@lwn.net>
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>
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 [thread overview]
Message-ID: <20190415074520.4ca92d50@lwn.net> (raw)
In-Reply-To: <a01e1602-3e82-f118-5fe4-1572647c06f9@linux.alibaba.com>
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
next prev parent reply other threads:[~2019-04-15 13:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 1:05 linux-next: manual merge of the bpf-next tree with the jc_docs tree Stephen Rothwell
2019-04-15 1:09 ` Stephen Rothwell
[not found] ` <a01e1602-3e82-f118-5fe4-1572647c06f9@linux.alibaba.com>
2019-04-15 13:45 ` Jonathan Corbet [this message]
2020-03-13 2:58 Stephen Rothwell
2020-03-13 19:51 ` Alexei Starovoitov
2020-03-13 20:08 ` Stephen Kitt
2021-11-17 23:13 Stephen Rothwell
2021-11-17 23:20 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190415074520.4ca92d50@lwn.net \
--to=corbet@lwn.net \
--cc=alex.shi@linux.alibaba.com \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).