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

[Alexei Starovoitov]

On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig <hch@xxxxxx> wrote:
>
> On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in:
> >
> >   kernel/sysctl.c
> >
> > between commit:
> >
> >   f461d2dcd511 ("sysctl: avoid forward declarations")
> >
> > from the bpf-next tree and commits:
>
> Hmm, the above should have gone in through Al..

Al pushed them into vfs tree and we pulled that tag into bpf-next.