Re: [PATCH 4/9] sched/balancing: Change comment formatting to not overlap Git conflict marker lines

[Vincent Guittot]

On Mon, 4 Mar 2024 at 10:48, Ingo Molnar <mingo@xxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
> Cc: Dietmar Eggemann <dietmar.eggemann@xxxxxxx>
> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> Cc: Valentin Schneider <vschneid@xxxxxxxxxx>

Reviewed-by: Vincent Guittot <vincent.guittot@xxxxxxxxxx>

> ---
>  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 f11fc6dd39b1..934ace69eb30 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.
> --
> 2.40.1
>