From: Steven Rostedt <rostedt@goodmis•org>
To: Alexei Starovoitov <alexei.starovoitov@gmail•com>
Cc: Mark Brown <broonie@kernel•org>,
Masami Hiramatsu <mhiramat@kernel•org>,
Alexei Starovoitov <ast@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Puranjay Mohan <puranjay@kernel•org>
Subject: Re: linux-next: manual merge of the ftrace tree with the bpf-next tree
Date: Mon, 2 Feb 2026 12:04:30 -0500 [thread overview]
Message-ID: <20260202120430.760a448f@gandalf.local.home> (raw)
In-Reply-To: <CAADnVQLa2z9mr856XStTFvfZxi8or1f9j8Gfu1h6m_A5ZN5eSw@mail.gmail.com>
On Mon, 2 Feb 2026 08:42:55 -0800
Alexei Starovoitov <alexei.starovoitov@gmail•com> wrote:
> I wonder whether we should take the whole srcu_fast in tracepoints
> patch set into bpf-next to avoid this conflict ?
> Probably not worth it in the last week before the merge window.
> Just a thought.
It's already in next where it would require a revert to get rid of.
There's just one patch that touches the bpf code, so it still makes more
sense to keep it in the tracing tree.
-- Steve
next prev parent reply other threads:[~2026-02-02 17:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-02 14:30 linux-next: manual merge of the ftrace tree with the bpf-next tree Mark Brown
2026-02-02 16:20 ` Steven Rostedt
2026-02-02 16:42 ` Alexei Starovoitov
2026-02-02 17:04 ` Steven Rostedt [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-30 22:33 Stephen Rothwell
2021-04-20 4:14 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=20260202120430.760a448f@gandalf.local.home \
--to=rostedt@goodmis$(echo .)org \
--cc=alexei.starovoitov@gmail$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=broonie@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=puranjay@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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