From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>,
Jonathan Corbet <corbet@lwn•net>
Cc: Bagas Sanjaya <bagasdotme@gmail•com>,
Gopi Krishna Menon <krishnagopi487@gmail•com>,
Ivan Pravdin <ipravdin.official@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tomas Glozar <tglozar@redhat•com>
Subject: linux-next: manual merge of the ftrace tree with the jc_docs tree
Date: Fri, 21 Nov 2025 12:35:09 +1100 [thread overview]
Message-ID: <20251121123509.5f07d818@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
Documentation/tools/rtla/common_options.txt
between commits:
96b546c241b1 ("Documentation/rtla: rename common_xxx.rst files to common_xxx.txt")
198fcc7cb832 ("Documentation/rtla: Mention default priority")
from the jc_docs tree and commit:
90241d14a726 ("rtla: Fix -C/--cgroup interface")
from the ftrace tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc Documentation/tools/rtla/common_options.txt
index 1c4f3e663cf5,edc8e850f5d0..000000000000
--- a/Documentation/tools/rtla/common_options.txt
+++ b/Documentation/tools/rtla/common_options.txt
@@@ -46,9 -42,7 +46,9 @@@
- *f:prio* - use SCHED_FIFO with *prio*;
- *d:runtime[us|ms|s]:period[us|ms|s]* - use SCHED_DEADLINE with *runtime* and *period* in nanoseconds.
+ If not set, tracer threads keep their default priority. For rtla user threads, it is set to SCHED_FIFO with priority 95. For kernel threads, see *osnoise* and *timerlat* tracer documentation for the running kernel version.
+
- **-C**, **--cgroup**\[*=cgroup*]
+ **-C**, **--cgroup** \[*cgroup*]
Set a *cgroup* to the tracer's threads. If the **-C** option is passed without arguments, the tracer's thread will inherit **rtla**'s *cgroup*. Otherwise, the threads will be placed on the *cgroup* passed to the option.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-21 1:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-21 1:35 Stephen Rothwell [this message]
2025-11-21 3:07 ` linux-next: manual merge of the ftrace tree with the jc_docs tree Bagas Sanjaya
2025-11-26 10:07 ` Gopi Krishna Menon
-- strict thread matches above, loose matches on Subject: below --
2023-02-15 1:16 Stephen Rothwell
2023-02-15 2:03 ` Bagas Sanjaya
2023-02-13 1:24 Stephen Rothwell
2021-08-20 4:02 Stephen Rothwell
2018-03-21 4:31 Stephen Rothwell
2018-03-21 4:37 ` Stephen Rothwell
2018-03-21 13:15 ` Steven Rostedt
2018-03-21 20:55 ` Tom Zanussi
2018-03-21 22:21 ` Stephen Rothwell
2018-03-21 23:09 ` Tom Zanussi
2018-03-22 13:41 ` Steven Rostedt
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=20251121123509.5f07d818@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bagasdotme@gmail$(echo .)com \
--cc=corbet@lwn$(echo .)net \
--cc=ipravdin.official@gmail$(echo .)com \
--cc=krishnagopi487@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=rostedt@goodmis$(echo .)org \
--cc=tglozar@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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