From: Quanyang Wang
When merging mainline commit bb193e3db8b8 ("net: axienet: fix for TX busy
handling"), the old function axienet_check_tx_bd_space was brought back,
so we need to delete it to fix compile error.
When merging mainline commit 95978df6fa32 ("net: axienet: add missing
memory
From: Quanyang Wang
When merging mainline commit bb193e3db8b8 ("net: axienet: fix for TX busy
handling"), the old function axienet_check_tx_bd_space was brought back,
so we need to delete it to fix compile error.
When merging mainline commit 95978df6fa32 ("net: axienet: add missing
memory
merged.
Bruce
In message:
[linux-yocto][v5.10/standard/preempt-rt/nxp-sdk-5.10/nxp-soc][v5.10/standard/nxp-sdk-5.10/nxp-soc][PATCH
1/1] thermal/drivers/imx: Fix a build error: 'run_measurement' undeclared in
imx_get_temp
on 07/02/2022 Xiaolei Wang wrote:
> Refer to Upstream commit
Refer to Upstream commit 4cf2ddf16e17("thermal/drivers/imx:
Implement runtime PM support"), run_measurement has been
deleted, this is a conflict generated during merge commit
c5b25bdcfe3c
Signed-off-by: Xiaolei Wang
---
drivers/thermal/imx_thermal.c | 31 +++
1 file
