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

[Bagas Sanjaya]

On Fri, Nov 21, 2025 at 12:35:09PM +1100, Stephen Rothwell wrote:
> 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.
>   

The resolution LGTM, thanks!

-- 
An old man doll... just what I always wanted! - Clara

Attachment: signature.asc
Description: PGP signature