On Wed, Aug 23, 2023 at 8:01 PM Mark Brown broonie@kernel.org wrote:
6b8b6892e434 is not applied?
Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.
Dear Mark, Please allow me to explain in more detail. The 6b8b6892e434 should not be applied into file0yZ50U branch of broonie/ci.git. Because the original commit 273bc8bf2227 ("ASoC: Intel: Add rpl_nau8318_8825 driver") was applied on 2023-08-14. But two days ago, 6b8b6892e434 tried to commit THE SAME patch again on 2023-08-21, but it just only added a little part content from original 273bc8bf2227. +static const struct snd_soc_acpi_codecs rpl_nau8318_amp = { + .num_codecs = 1, + .codecs = {"NVTN2012"} +}; + It caused "rpl_nau8318_amp" to be redefined. This condition only happens at broonie/ci.git's file0yZ50U branch.
Could you check this one again? thanks.