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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAKfTPtCHVkZudjwzErGvm+LboB39shN_rOVLXMMusEkdXAk0aw@mail.gmail.com>
Date: Wed, 6 Mar 2024 16:44:22 +0100
From: Vincent Guittot <vincent.guittot@...aro.org>
To: Ingo Molnar <mingo@...nel.org>
Cc: linux-kernel@...r.kernel.org, Shrikanth Hegde <sshegde@...ux.ibm.com>, 
	Peter Zijlstra <peterz@...radead.org>, Dietmar Eggemann <dietmar.eggemann@....com>, 
	Linus Torvalds <torvalds@...ux-foundation.org>, Valentin Schneider <vschneid@...hat.com>
Subject: Re: [PATCH 4/9] sched/balancing: Change comment formatting to not
 overlap Git conflict marker lines

On Mon, 4 Mar 2024 at 10:48, Ingo Molnar <mingo@...nel.org> 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@...nel.org>
> Cc: Peter Zijlstra <peterz@...radead.org>
> Cc: Vincent Guittot <vincent.guittot@...aro.org>
> Cc: Dietmar Eggemann <dietmar.eggemann@....com>
> Cc: Linus Torvalds <torvalds@...ux-foundation.org>
> Cc: Valentin Schneider <vschneid@...hat.com>

Reviewed-by: Vincent Guittot <vincent.guittot@...aro.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 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
>