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

Stephen Kitt
2020-03-13T20:28:28Z

[-- 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 --]