diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-10-17 10:58:07 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-10-17 10:58:07 +0300 |
| commit | be602cde657ee43d23adbf309be6d700d0106dc9 (patch) | |
| tree | d27775738d0deefe7c3071be7d667912dc3ee932 /scripts/package | |
| parent | cd9626e9ebc77edec33023fe95dab4b04ffc819d (diff) | |
| parent | c964ced7726294d40913f2127c3f185a92cb4a41 (diff) | |
| download | linux-be602cde657ee43d23adbf309be6d700d0106dc9.tar.xz | |
Merge branch 'linus' into sched/urgent, to resolve conflict
Conflicts:
kernel/sched/ext.c
There's a context conflict between this upstream commit:
3fdb9ebcec10 sched_ext: Start schedulers with consistent p->scx.slice values
... and this fix in sched/urgent:
98442f0ccd82 sched: Fix delayed_dequeue vs switched_from_fair()
Resolve it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/package')
| -rwxr-xr-x | scripts/package/builddeb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index c1757db6aa8a..404587fc71fe 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -74,7 +74,6 @@ install_linux_image () { mkdir -p "${pdir}/DEBIAN" cat <<-EOF > "${pdir}/DEBIAN/${script}" - #!/bin/sh set -e |