Messages in this thread | | | Date | Mon, 15 Aug 2022 14:55:13 +0300 | From | Ido Schimmel <> | Subject | Re: [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" |
| |
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
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
| |