mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Tejun Heo <tj@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Andrea Righi <arighi@nvidia.com>,
	Kuba Piecuch <jpiecuch@google.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the sched-ext tree with the origin tree
Date: Mon, 19 Oct 2026 07:11:38 -1000	[thread overview]
Message-ID: <803525ea614f78908df69335e909f748@kernel.org> (raw)
In-Reply-To: <atZM-tXvYuR1bE3z@sirena.co.uk>

Hello, Mark.

This one is also already resolved in sched_ext/for-next by a5ba5c61951d
("sched_ext: Merge branch 'for-7.3-fixes' into for-7.4"), which applies
the rename where scx_reenq_reject() now lives in ext.c. The sched-ext
side of your diff matches for-next as of Oct 9 (a8acb152ff95), from
before that merge. The current for-next (24c453aa8598) merges cleanly
into mainline.

Thanks.

-- 
tejun

  reply	other threads:[~2026-10-19 17:11 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-19 17:01 Mark Brown
2026-10-19 17:11 ` Tejun Heo [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-10-19 17:01 Mark Brown
2026-10-19 17:11 ` Tejun Heo

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=803525ea614f78908df69335e909f748@kernel.org \
    --to=tj@kernel.org \
    --cc=arighi@nvidia.com \
    --cc=broonie@kernel.org \
    --cc=jpiecuch@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®