From: Steven Rostedt <rostedt@goodmis.org>
To: Tomas Glozar <tglozar@redhat.com>
Cc: Costa Shulyupin <costa.shul@redhat.com>,
Wander Lairson Costa <wander@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
linux-trace-kernel <linux-trace-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] RTLA changes for v7.1
Date: Thu, 2 Apr 2026 12:28:54 -0400 [thread overview]
Message-ID: <20260402122854.2e47eeba@gandalf.local.home> (raw)
In-Reply-To: <20260402122634.4d750f2c@gandalf.local.home>
On Thu, 2 Apr 2026 12:26:34 -0400
Steven Rostedt <rostedt@goodmis.org> 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
prev parent reply other threads:[~2026-04-02 16:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-27 15:02 Tomas Glozar
2026-03-29 16:22 ` Steven Rostedt
2026-04-02 15:08 ` Tomas Glozar
2026-04-02 16:26 ` Steven Rostedt
2026-04-02 16:28 ` Steven Rostedt [this message]
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=20260402122854.2e47eeba@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=costa.shul@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=tglozar@redhat.com \
--cc=wander@redhat.com \
/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