[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210917084912.070e133f@canb.auug.org.au>
Date: Fri, 17 Sep 2021 08:49:12 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Arnaldo Carvalho de Melo <arnaldo.melo@...il.com>
Cc: Alexei Starovoitov <alexei.starovoitov@...il.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Andrii Nakryiko <andrii@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Jiri Olsa <jolsa@...nel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for Sep 16
Hi all,
On Thu, 16 Sep 2021 18:43:37 -0300 Arnaldo Carvalho de Melo <arnaldo.melo@...il.com> wrote:
>
> On September 16, 2021 2:30:04 PM GMT-03:00, Alexei Starovoitov <alexei.starovoitov@...il.com> wrote:
> >On Wed, Sep 15, 2021 at 11:11 PM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >>
> >> Changes since 20210915:
> >>
> >> The bpf-next tree still had its build failure so I used the version from
> >> next-20210913.
> >
> >Arnaldo,
> >
> >could you please push Andrii's fix into your tree asap
> >and then cleanup/follow up with a better fix if necessary?
>
> It's there since yesterday:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/commit/?h=perf/core&id=00e0ca3721cf2ddcb38cf676a3de61933640d31d
>
> Replying just now since it's a holiday here and I was AFK.
But that is not in any tree that is included in linux-next (and when it
does appear, it will be in the tip tree which gets merged well after
the bpf-next tree). I will include that patch as a merge fix up for
the bpf-next tree until that patch has gone into Linus' tree ... so,
someone has to ensure that this patch get into Linus tree *before* the
bpf-next tree.
So, do you see the problem? Linus' tree is fine on its own. The
bpf-next tree has a patch that breaks Linus' tree, but the breakage is
not seen in the bpf-next tree because it is base on v5.14 and the
interacting patch is in v5.15-rc1.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists