Subject: linux-next: manual merge of the ftrace tree with the jc_docs tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 21 Nov 2025 12:35:09 +1100

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.