From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Tejun Heo <tj@kernel•org>, Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Tianchen Ding <dtcccc@linux•alibaba.com>
Subject: linux-next: manual merge of the sched-ext tree with the tip tree
Date: Thu, 1 Aug 2024 12:45:41 +1000 [thread overview]
Message-ID: <20240801124541.3deb64b8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 749 bytes --]
Hi all,
Today's linux-next merge of the sched-ext tree got a conflict in:
kernel/sched/fair.c
between commit:
faa42d29419d ("sched/fair: Make SCHED_IDLE entity be preempted in strict hierarchy")
from the tip tree and commit:
2c8d046d5d51 ("sched: Add normal_policy()")
from the sched-ext tree.
I fixed it up (I used the former version) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-08-01 2:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 2:45 Stephen Rothwell [this message]
2024-08-04 17:42 ` linux-next: manual merge of the sched-ext tree with the tip tree Tejun Heo
-- strict thread matches above, loose matches on Subject: below --
2026-03-09 18:49 Mark Brown
2026-03-09 20:02 ` Tejun Heo
2026-03-03 13:28 Mark Brown
2024-10-15 2:49 Stephen Rothwell
2024-10-17 2:22 ` Stephen Rothwell
2024-09-11 6:40 Stephen Rothwell
2024-09-11 19:03 ` Tejun Heo
2024-08-22 3:43 Stephen Rothwell
2024-08-01 2:45 Stephen Rothwell
2024-08-01 2:45 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240801124541.3deb64b8@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dtcccc@linux$(echo .)alibaba.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox