lkml.org 
[lkml]   [2020]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the bpf-next tree with the jc_docs tree
On Thu, Mar 12, 2020 at 7:59 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> 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.
Thanks

\
 
 \ /
  Last update: 2020-03-13 20:53    [W:0.058 / U:21.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site