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

[Mark Brown]

On Mon, Sep 28, 2026 at 07:45:54PM +0530, Shrikanth Hegde wrote:
> On 9/28/26 7:28 PM, Mark Brown wrote:

> > +++ b/Documentation/scheduler/index.rst
> > @@@ -23,6 -23,6 +23,7 @@@ Schedule
> >        sched-stats
> >        sched-ext
> >        sched-debug
> > +     sched-paravirt
> >   +    sched-preemption
> >        text_files

> Looks correct to me.
> I guess it clashed since both were beginning around sched-p.

> Sorry, I should have mentioned, But it didn't occur to me when I sent it.

Don't worry about it, trivial conflicts like this don't cause any real
issues.

Attachment: signature.asc
Description: PGP signature