From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jiri Olsa <jolsa@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: Tree for Sep 16
Date: Fri, 17 Sep 2021 08:49:12 +1000 [thread overview]
Message-ID: <20210917084912.070e133f@canb.auug.org.au> (raw)
In-Reply-To: <8850F8DA-5C73-4A2C-92C7-FE17ADCD2ADB@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1473 bytes --]
Hi all,
On Thu, 16 Sep 2021 18:43:37 -0300 Arnaldo Carvalho de Melo <arnaldo.melo@gmail.com> wrote:
>
> On September 16, 2021 2:30:04 PM GMT-03:00, Alexei Starovoitov <alexei.starovoitov@gmail.com> wrote:
> >On Wed, Sep 15, 2021 at 11:11 PM Stephen Rothwell <sfr@canb.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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-09-16 22:49 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-16 6:11 linux-next: Tree for Sep 16 Stephen Rothwell
2021-09-16 17:30 ` Alexei Starovoitov
2021-09-16 21:43 ` Arnaldo Carvalho de Melo
2021-09-16 22:49 ` Stephen Rothwell [this message]
2021-09-16 22:53 ` Arnaldo Carvalho de Melo
-- strict thread matches above, loose matches on Subject: below --
2022-09-16 6:52 Stephen Rothwell
2020-09-16 7:39 Stephen Rothwell
2019-09-16 22:38 Mark Brown
2016-09-16 4:45 Stephen Rothwell
2015-09-16 3:15 Stephen Rothwell
2014-09-16 7:56 Stephen Rothwell
2014-09-17 18:12 ` Guenter Roeck
2013-09-16 3:13 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210917084912.070e133f@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=acme@kernel.org \
--cc=alexei.starovoitov@gmail.com \
--cc=andrii@kernel.org \
--cc=arnaldo.melo@gmail.com \
--cc=daniel@iogearbox.net \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).