All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Kitt <steve@sk2.org>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Alexei Starovoitov <ast@kernel.org>,
	Networking <netdev@vger.kernel.org>,
	Jonathan Corbet <corbet@lwn.net>,
	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: Fri, 13 Mar 2020 21:08:24 +0100	[thread overview]
Message-ID: <20200313210824.177688ba@heffalump.sk2.org> (raw)
In-Reply-To: <CAADnVQ+r3hMEtqbkhm1j9HyXYxSNihbX=VCR9erUGXoE72Pwsg@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 710 bytes --]

On Fri, 13 Mar 2020 12:51:54 -0700, Alexei Starovoitov
<alexei.starovoitov@gmail.com> wrote:
> On Thu, Mar 12, 2020 at 7:59 PM Stephen Rothwell <sfr@canb.auug.org.au>
> wrote:
> > Today's linux-next merge of the bpf-next tree got a conflict in:
> >
> >   Documentation/admin-guide/sysctl/kernel.rst
> >
> > between commit:
> >
> >   a3cb66a50852 ("docs: pretty up sysctl/kernel.rst")
> >
> > from the jc_docs tree and commit:
> >
> >   c480a3b79cbc ("docs: sysctl/kernel: Document BPF entries")
> >
> > from the bpf-next tree.  
> 
> I dropped this commit from bpf-next, since it causes unnecessary conflicts.
> Please steer it via Jon's tree.

OK, I’ll do that.

Regards,

Stephen

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2020-03-13 20:16 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-13  2:58 linux-next: manual merge of the bpf-next tree with the jc_docs tree Stephen Rothwell
2020-03-13 19:51 ` Alexei Starovoitov
2020-03-13 20:08   ` Stephen Kitt [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-17 23:13 Stephen Rothwell
2021-11-17 23:20 ` Daniel Borkmann
2019-04-12  1:05 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

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=20200313210824.177688ba@heffalump.sk2.org \
    --to=steve@sk2.org \
    --cc=alexei.starovoitov@gmail.com \
    --cc=ast@kernel.org \
    --cc=corbet@lwn.net \
    --cc=daniel@iogearbox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.