On 4/15/20 8:41 PM, Sasha Levin wrote:

On Wed, Apr 15, 2020 at 11:36:55AM -0700, Guenter Roeck wrote:

...

Hi,

The folloewing build failures currently observed with stable release candidates.

Thanks, Guenter

---

v4.19.y:

drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:392:14: error: 'chipFeatures_PIPE_3D' undeclared here drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:397:14: error: 'chipFeatures_PIPE_2D' drivers/gpu/drm/etnaviv/etnaviv_perfmon.c:402:14: error: 'chipFeatures_PIPE_VG' undeclared here

Culprit is 'drm/etnaviv: rework perfmon query infrastructure'. Applying commit 15ff4a7b5841 ("etnaviv: perfmon: fix total and idle HI cyleces readout") as well fixes the problem.

Done.

...

v5.4.y, v5.5.y:

drivers/mmc/host/sdhci-tegra.c: In function 'tegra_sdhci_set_timeout': drivers/mmc/host/sdhci-tegra.c:1256:2: error:     implicit declaration of function '__sdhci_set_timeout'

Culprit is "sdhci: tegra: Implement Tegra specific set_timeout callback". __sdhci_set_timeout() was introduced with commit 7d76ed77cfbd3 ("mmc: sdhci: Refactor sdhci_set_timeout()"). Unfortunately, applying that patch results in a conflict.

But that patch can be resolved by grabbing 7907ebe741a7 ("mmc: sdhci: Convert sdhci_set_timeout_irq() to non-static") which just makes __sdhci_set_timeout() non-static.

7907ebe741a7 doesn't apply to v5.4.y / v5.5.y either (because sdhci_switch_external_dma is missing). If you resolve that conflict, you might as well resolve the conflict when applying 7d76ed77cfbd3 instead. After all, 7907ebe741a7 isn't really needed, at least as far as I can see.

Thanks, Guenter