Received-SPF: pass (google.com: domain of linux-kernel+bounces-94185-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Precedence: bulk
MIME-Version: 1.0
References: <20240304094831.3639338-1-mingo@kernel.org> <20240304094831.3639338-5-mingo@kernel.org>
In-Reply-To: <20240304094831.3639338-5-mingo@kernel.org>
From: Vincent Guittot <vincent.guittot@linaro.org>
Date: Wed, 6 Mar 2024 16:44:22 +0100
Message-ID: <CAKfTPtCHVkZudjwzErGvm+LboB39shN_rOVLXMMusEkdXAk0aw@mail.gmail.com>
Subject: Re: [PATCH 4/9] sched/balancing: Change comment formatting to not
 overlap Git conflict marker lines
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Shrikanth Hegde <sshegde@linux.ibm.com>, 
	Peter Zijlstra <peterz@infradead.org>, Dietmar Eggemann <dietmar.eggemann@arm.com>, 
	Linus Torvalds <torvalds@linux-foundation.org>, Valentin Schneider <vschneid@redhat.com>
Content-Type: text/plain; charset="UTF-8"

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

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