[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20b6dd31-0ac3-ff92-0b58-629847508fa1@linaro.org>
Date: Mon, 15 Aug 2022 14:15:18 +0200
From: Daniel Lezcano <daniel.lezcano@...aro.org>
To: Ido Schimmel <idosch@...dia.com>
Cc: rafael@...nel.org, vadimp@...lanox.com, davem@...emloft.net,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
Vadim Pasternak <vadimp@...dia.com>,
Petr Machata <petrm@...dia.com>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>
Subject: Re: [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone
detection"
On 15/08/2022 13:55, Ido Schimmel wrote:
> On Mon, Aug 15, 2022 at 11:10:32AM +0200, Daniel Lezcano wrote:
>> diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
>> index f5751242653b..237a813fbb52 100644
>> --- a/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
>> +++ b/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
>> @@ -22,7 +22,6 @@
>> #define MLXSW_THERMAL_HYSTERESIS_TEMP 5000 /* 5C */
>> #define MLXSW_THERMAL_MODULE_TEMP_SHIFT (MLXSW_THERMAL_HYSTERESIS_TEMP * 2)
>> #define MLXSW_THERMAL_ZONE_MAX_NAME 16
>
> Which tree is this patch from? The define is no longer in mainline:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/mellanox/mlxsw/core_thermal.c
It applies against:
https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git/log/?h=thermal/linux-next
But it is not refreshed against v6.0-rc1
I'll take care of giving a respin of the patch before resending.
> Getting a conflict when trying to apply this patch
>
>> -#define MLXSW_THERMAL_TEMP_SCORE_MAX GENMASK(31, 0)
>> #define MLXSW_THERMAL_MAX_STATE 10
>> #define MLXSW_THERMAL_MIN_STATE 2
>> #define MLXSW_THERMAL_MAX_DUTY 255
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Powered by blists - more mailing lists