On Tue, 24 Mar 2026 20:39:41 -0400 Steven Rostedt <[email protected]> wrote:
> On Wed, 25 Mar 2026 09:13:04 +0900 > Masami Hiramatsu (Google) <[email protected]> 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. OK, refresh the ring-buffer/for-next branch and it has the fix merged. There's still a small conflict (with a header file include). Could you rebase on that? Thanks, -- Steve
