From: Ido Schimmel <idosch@nvidia.com>
To: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: rafael@kernel.org, vadimp@mellanox.com, davem@davemloft.net,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Vadim Pasternak <vadimp@nvidia.com>,
Petr Machata <petrm@nvidia.com>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Subject: Re: [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection"
Date: Mon, 15 Aug 2022 14:55:13 +0300 [thread overview]
Message-ID: <Yvo0IWgDQ0wZ20g6@shredder> (raw)
In-Reply-To: <20220815091032.1731268-2-daniel.lezcano@linaro.org>
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
next prev parent reply other threads:[~2022-08-15 11:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-15 9:10 [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Daniel Lezcano
2022-08-15 9:10 ` [PATCH v2 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" Daniel Lezcano
2022-08-15 11:55 ` Ido Schimmel [this message]
2022-08-15 12:15 ` Daniel Lezcano
2022-08-15 11:47 ` [PATCH v2 1/2] Revert "mlxsw: core: Use different get_trend() callbacks for different thermal zones" Ido Schimmel
2022-08-15 11:56 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yvo0IWgDQ0wZ20g6@shredder \
--to=idosch@nvidia.com \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=petrm@nvidia.com \
--cc=rafael@kernel.org \
--cc=vadimp@mellanox.com \
--cc=vadimp@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.