[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251201205132.520eb490@gandalf.local.home>
Date: Mon, 1 Dec 2025 20:51:32 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Gabriele Monaco <gmonaco@...hat.com>
Cc: Nam Cao <namcao@...utronix.de>, Masami Hiramatsu <mhiramat@...nel.org>,
Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
linux-trace-kernel@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 1/2] rv: Convert to use lock guard
On Mon, 1 Dec 2025 20:38:16 -0500
Steven Rostedt <rostedt@...dmis.org> wrote:
> On Mon, 01 Dec 2025 16:28:21 +0100
> Gabriele Monaco <gmonaco@...hat.com> wrote:
>
> > I'm stupid, I sent it [1] but the script somehow didn't add you in the To: field
> > and I didn't notice..
> >
> > I'd say since the merge window is open, this change can wait.
> >
> > Sorry for that.
> >
> > Gabriele
> >
> > [1] - https://lore.kernel.org/lkml/20251126152253.464350-1-gmonaco@redhat.com
>
> I can still pull it and run it through my tests tonight and push it later this week.
>
> It's just clean up code. Linus doesn't get too upset if simple cleanup code
> gets added just before the merge window. It's new features that he doesn't
> like added late in the game.
After pulling it, I take it back ;-)
It's best to always use your latest branch that you did your last pull on
during a release cycle.
I see you based these changes on v6.18-rc7, but your previous pull was
based on v6.18-rc5. If I were to pull this in, it gets a bit spaghetti like
in the merges.
v6.18-rc5 -> pull1
merge <- v6.18-rc7 <- pull2
Where now we have changes between rc5 and rc7. Was there a reason you
based on top of rc7 and not use your last pull?
It's fine sending urgent patches this way, as these tags are in Linus's
tree and it's just new changes being added. But for a subsytem tree, it's
best not to pull in Linus's tree unless there's a good reason to do that.
What I can do is simply pull the patches on top of your last patch
directly, and keep the history clean for my pull request to Linus.
-- Steve
Powered by blists - more mailing lists