From: Tejun Heo <tj@kernel•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
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: Re: linux-next: manual merge of the sched-ext tree with the tip tree
Date: Sun, 4 Aug 2024 07:42:36 -1000 [thread overview]
Message-ID: <Zq-9jLqKelS1Y6bT@slm.duckdns.org> (raw)
In-Reply-To: <20240801124541.3deb64b8@canb.auug.org.au>
Hello, Stephen.
On Thu, Aug 01, 2024 at 12:45:41PM +1000, Stephen Rothwell wrote:
> 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.
This merge is a bit tricky because the former moves the test that the latter
converts and the new location doesn't show up as conflict. I merged
tip/sched/core into sched_ext/for-6.12 and resolved all the conflicts.
Thanks.
--
tejun
next prev parent reply other threads:[~2024-08-04 17:42 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 2:45 linux-next: manual merge of the sched-ext tree with the tip tree Stephen Rothwell
2024-08-04 17:42 ` Tejun Heo [this message]
-- 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=Zq-9jLqKelS1Y6bT@slm.duckdns.org \
--to=tj@kernel$(echo .)org \
--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=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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