From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Valentin Schneider <vschneid@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] sched/balancing: Change comment formatting to not overlap Git conflict marker lines
Date: Tue, 12 Mar 2024 12:00:31 -0000 [thread overview]
Message-ID: <171024483192.398.2147820481172410047.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240308105901.1096078-7-mingo@kernel.org>
The following commit has been merged into the sched/core branch of tip:
Commit-ID: be8858dba9a2c3aec454a6b382671101fd0dc3b7
Gitweb: https://git.kernel.org/tip/be8858dba9a2c3aec454a6b382671101fd0dc3b7
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Fri, 08 Mar 2024 11:58:57 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Tue, 12 Mar 2024 11:03:41 +01:00
sched/balancing: Change comment formatting to not overlap Git conflict marker lines
So the scheduler has two such comment blocks, with '=' used as a double underline:
/*
* VRUNTIME
* ========
*
'========' also happens to be a Git conflict marker, throwing off a simple
search in an editor for this pattern.
Change them to '-------' type of underline instead - it looks just as good.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
Reviewed-by: Vincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20240308105901.1096078-7-mingo@kernel.org
---
kernel/sched/fair.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 3a510cf..84d4791 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3679,7 +3679,7 @@ static void reweight_eevdf(struct cfs_rq *cfs_rq, struct sched_entity *se,
/*
* VRUNTIME
- * ========
+ * --------
*
* COROLLARY #1: The virtual runtime of the entity needs to be
* adjusted if re-weight at !0-lag point.
@@ -3762,7 +3762,7 @@ static void reweight_eevdf(struct cfs_rq *cfs_rq, struct sched_entity *se,
/*
* DEADLINE
- * ========
+ * --------
*
* When the weight changes, the virtual time slope changes and
* we should adjust the relative virtual deadline accordingly.
next prev parent reply other threads:[~2024-03-12 12:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-08 10:58 [PATCH -v4 00/10] sched/balancing: Misc updates & cleanups Ingo Molnar
2024-03-08 10:58 ` [PATCH 01/10] sched/balancing: Switch the 'DEFINE_SPINLOCK(balancing)' spinlock into an 'atomic_t sched_balance_running' flag Ingo Molnar
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2024-03-15 9:25 ` [PATCH 01/10] " Shrikanth Hegde
2024-03-08 10:58 ` [PATCH 02/10] sched/balancing: Remove reliance on 'enum cpu_idle_type' ordering when iterating [CPU_MAX_IDLE_TYPES] arrays in show_schedstat() Ingo Molnar
2024-03-08 13:26 ` Vincent Guittot
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Shrikanth Hegde
2024-03-08 10:58 ` [PATCH 03/10] sched/balancing: Change 'enum cpu_idle_type' to have more natural definitions Ingo Molnar
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2024-03-08 10:58 ` [PATCH 04/10] sched/debug: Increase SCHEDSTAT_VERSION to 16 Ingo Molnar
2024-03-08 16:40 ` Shrikanth Hegde
2024-03-12 10:01 ` Ingo Molnar
2024-03-14 5:21 ` Gautham R. Shenoy
2024-03-14 6:04 ` Swapnil Sapkal
2024-03-15 4:37 ` Shrikanth Hegde
2024-03-15 9:06 ` Swapnil Sapkal
2024-03-15 9:20 ` Shrikanth Hegde
2024-03-15 14:03 ` Swapnil Sapkal
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2024-03-08 10:58 ` [PATCH 05/10] sched/debug: Allow CONFIG_SCHEDSTATS even on !KERNEL_DEBUG kernels Ingo Molnar
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2024-03-08 10:58 ` [PATCH 06/10] sched/balancing: Change comment formatting to not overlap Git conflict marker lines Ingo Molnar
2024-03-12 12:00 ` tip-bot2 for Ingo Molnar [this message]
2024-03-08 10:58 ` [PATCH 07/10] sched/balancing: Fix comments (trying to) refer to NOHZ_BALANCE_KICK Ingo Molnar
2024-03-08 12:03 ` Vincent Guittot
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2024-03-08 10:58 ` [PATCH 08/10] sched/balancing: Update run_rebalance_domains() comments Ingo Molnar
2024-03-08 12:02 ` Vincent Guittot
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2024-03-08 10:59 ` [PATCH 09/10] sched/balancing: Vertically align the comments of 'struct sg_lb_stats' and 'struct sd_lb_stats' Ingo Molnar
2024-03-08 12:01 ` Vincent Guittot
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
2024-03-08 10:59 ` [PATCH 10/10] sched/balancing: Update comments in " Ingo Molnar
2024-03-08 12:01 ` Vincent Guittot
2024-03-12 12:00 ` [tip: sched/core] " tip-bot2 for Ingo Molnar
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=171024483192.398.2147820481172410047.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=vincent.guittot@linaro.org \
--cc=vschneid@redhat.com \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).