Re: [GIT PULL] RTLA changes for v7.1

From: Steven Rostedt

Date: Thu Apr 02 2026 - 12:37:01 EST


On Thu, 2 Apr 2026 12:26:34 -0400
Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:

> This is fine as is. Linus is used to this. He's even OK with minor merge
> conflicts. The only time you really need to tell Linus about something is
> if the merge conflicts or a merge causes something to break but merges
> cleanly (like removing an extra #endif)

In fact, Linus actually looks down at rebasing. You should only rebase if
there's something really nasty.

The code is already in linux-next. Which means it should not be rebased at
all.

-- Steve