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

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:

  0fe73f87ba37 ("parisc: add sysctl file interface panic_on_stackoverflow")
  631b6d13906c ("kernel/hung_task.c: introduce sysctl to print all traces when a hung task is detected")
  0defdd249368 ("panic: add sysctl to dump all CPUs backtraces on oops event")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

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..

On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig <hch@lst.de> 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.

On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote:
> On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig <hch@lst.de> 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.

Ok.  And Stephen pulled your tree first.

Hi Christoph,

On Wed, 29 Apr 2020 08:54:04 +0200 Christoph Hellwig <hch@lst.de> 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 <hch@lst.de> 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.

On Wed, Apr 29, 2020 at 06:24:06PM +1000, Stephen Rothwell wrote:
> Hi Christoph,
> 
> On Wed, 29 Apr 2020 08:54:04 +0200 Christoph Hellwig <hch@lst.de> 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 <hch@lst.de> 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.

Now it is...