From: Steven Rostedt <rostedt@goodmis.org>
To: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
Ian Rogers <irogers@google.com>
Subject: Re: [PATCH v12 0/4] ring-buffer: Making persistent ring buffers robust
Date: Tue, 24 Mar 2026 20:39:41 -0400 [thread overview]
Message-ID: <20260324203941.2bd628d9@gandalf.local.home> (raw)
In-Reply-To: <20260325091304.c94f4e9505660202f96006a1@kernel.org>
On Wed, 25 Mar 2026 09:13:04 +0900
Masami Hiramatsu (Google) <mhiramat@kernel.org> wrote:
> I found the branch does not have a fix [1] and it makes a conflict with
> [2/4]. Can you update it to merge the trace/fixes branch?
>
> [1] f35dbac69421 ("ring-buffer: Fix to update per-subbuf entries of persistent ring buffer")
>
> I can send a series on ring-buffer/for-next but I think it may
> cause the same conflict on git-pull later.
Ah crap. OK, let me merge in that commit to the for-next branch, and then see if it works.
Thanks for letting me know.
-- Steve
next prev parent reply other threads:[~2026-03-25 0:39 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-24 0:00 [PATCH v12 0/4] ring-buffer: Making persistent ring buffers robust Masami Hiramatsu (Google)
2026-03-24 0:00 ` [PATCH v12 1/4] ring-buffer: Flush and stop persistent ring buffer on panic Masami Hiramatsu (Google)
2026-03-24 0:00 ` [PATCH v12 2/4] ring-buffer: Skip invalid sub-buffers when validating persistent ring buffer Masami Hiramatsu (Google)
2026-03-24 0:00 ` [PATCH v12 3/4] ring-buffer: Skip invalid sub-buffers when rewinding " Masami Hiramatsu (Google)
2026-03-24 0:00 ` [PATCH v12 4/4] ring-buffer: Add persistent ring buffer selftest Masami Hiramatsu (Google)
2026-03-24 21:25 ` [PATCH v12 0/4] ring-buffer: Making persistent ring buffers robust Steven Rostedt
2026-03-24 23:56 ` Masami Hiramatsu
2026-03-25 0:13 ` Masami Hiramatsu
2026-03-25 0:39 ` Steven Rostedt [this message]
2026-03-25 0:47 ` Steven Rostedt
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=20260324203941.2bd628d9@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@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