Re: [GIT PULL] tracing tools: RTLA updates for 7.2

[Steven Rostedt <rostedt@goodmis.org>]

On Tue, 16 Jun 2026 18:05:03 +0530
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Tue, 16 Jun 2026 at 01:55, Steven Rostedt <rostedt@goodmis.org> wrote:
> >
> > - Migrate command line interface to libsubcmd  
> 
> I'm assuming the annoying conflicts - that you didn't mention - with
> commit e9e41d303503 ("rtla: Fix parsing of multi-character short
> options") are just "take the new code".
> 
> Becasue that's what I did. While swearing over the pointlessness of this all.

Sorry about that :-(  Unfortunately you opened the merge window while
I'm starting my new job, and I'm currently in London doing the
orientation all day for the the next two weeks. I only have a couple
hours a day to do upstream work while I'm here. I usually merge the
code into your branch to check for conflicts before sending them but I
don't usually do that for the tooling branch.

This conflict was reported by linux-next, but I simply forgot about it. :-(

-- Steve