linux-kernel - linux-next: manual merge of the sched-ext tree with the tip tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240801124538.63ce5dbe@canb.auug.org.au>
Date: Thu, 1 Aug 2024 12:45:38 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Tejun Heo <tj@...nel.org>, Thomas Gleixner <tglx@...utronix.de>, Ingo
 Molnar <mingo@...hat.com>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra
 <peterz@...radead.org>
Cc: Daniel Bristot de Oliveira <bristot@...nel.org>, Linux Kernel Mailing
 List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the sched-ext tree with the tip tree

Hi all,

Today's linux-next merge of the sched-ext tree got a conflict in:

  kernel/sched/idle.c

between commit:

  a110a81c52a9 ("sched/deadline: Deferrable dl server")

from the tip tree and commit:

  a7a9fc549293 ("sched_ext: Add boilerplate for extensible scheduler class")

from the sched-ext tree.

I fixed it up (I think, 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 kernel/sched/idle.c
index d560f7ffa463,c7a218123b7a..000000000000
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@@ -452,14 -452,14 +452,16 @@@ static void wakeup_preempt_idle(struct 

  static void put_prev_task_idle(struct rq *rq, struct task_struct *prev)
  {
 +	dl_server_update_idle_time(rq, prev);
+ 	scx_update_idle(rq, false);
  }

  static void set_next_task_idle(struct rq *rq, struct task_struct *next, bool first)
  {
  	update_idle_core(rq);
+ 	scx_update_idle(rq, true);
  	schedstat_inc(rq->sched_goidle);
 +	next->se.exec_start = rq_clock_task(rq);
  }

  #ifdef CONFIG_SMP

Content of type "application/pgp-signature" skipped