Messages in this thread | | | Date | Fri, 5 Aug 2022 18:07:11 +0200 | Subject | Re: [PATCH 2/2] Revert "mlxsw: core: Add the hottest thermal zone detection" | From | Daniel Lezcano <> |
| |
Hi Vadim,
On 04/08/2022 14:21, Vadim Pasternak wrote: > > >> -----Original Message----- >> From: Daniel Lezcano <daniel.lezcano@linaro.org> >> Sent: Monday, August 1, 2022 12:56 PM >> To: daniel.lezcano@linaro.org; rafael@kernel.org >> Cc: Vadim Pasternak <vadimp@nvidia.com>; davem@davemloft.net; >> netdev@vger.kernel.org; linux-kernel@vger.kernel.org; Ido Schimmel >> <idosch@nvidia.com>; Petr Machata <petrm@nvidia.com>; Eric Dumazet >> <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni >> <pabeni@redhat.com> >> Subject: [PATCH 2/2] Revert "mlxsw: core: Add the hottest thermal zone >> detection" >> >> This reverts commit 6f73862fabd93213de157d9cc6ef76084311c628. >> >> As discussed in the thread: >> >> https://lore.kernel.org/all/f3c62ebe-7d59-c537-a010- >> bff366c8aeba@linaro.org/ >> >> the feature provided by commits 2dc2f760052da and 6f73862fabd93 is >> actually already handled by the thermal framework via the cooling device >> state aggregation, thus all this code is pointless. >> >> The revert conflicts with the following changes: >> - 7f4957be0d5b8: thermal: Use mode helpers in drivers >> - 6a79507cfe94c: mlxsw: core: Extend thermal module with per QSFP module >> thermal zones >> >> These conflicts were fixed and the resulting changes are in this patch. >> >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> > Tested-by: Vadim Pasternak <vadimp@nvidia.com>
Thanks for testing
> Daniel, > Could you, please, re-base the patch on top of net-next as Jakub mentioned? > Or do you want me to do it?
It is fine, I can do it. The conflict is trivial.
However, I would have preferred to have the patch in my tree so I can continue the consolidation work.
Is it ok if I pick the patch and the conflict being simple, that can be handle at merge time, no?
> There is also redundant blank line in this patch: > &mlxsw_thermal_module_ops, > + > &mlxsw_thermal_params,
Yeah, thanks.
-- <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
| |