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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 29 Apr 2020 18:24:06 +1000

Hi Christoph,

On Wed, 29 Apr 2020 08:54:04 +0200 Christoph Hellwig <[email-masked]> wrote:
>
> On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote:
> > On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig <[email-masked]> wrote:  
> > >
> > > On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:  
> > > >
> > > > 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.  
> 
> Ok.  And Stephen pulled your tree first.

No, it is not in the branch I fetch from Al yet.

-- 
Cheers,
Stephen Rothwell