-----Original Message-----
From: Andy Shevchenko <redacted>
Sent: Wednesday, July 28, 2021 10:02 AM
To: Mark Brown <broonie@kernel.org>
Cc: Hans de Goede <redacted>; Gross, Mark
[off-list ref]; Kammela, Gayatri [off-list ref];
Rajneesh Bhardwaj [off-list ref]; Linux Kernel Mailing List
[off-list ref]; Linux Next Mailing List <linux-
next@vger.kernel.org>; Platform Driver <platform-driver-
x86@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree

On Wed, Jul 28, 2021 at 7:49 PM Mark Brown [off-list ref] wrote:

quoted

Hi all,

After merging the drivers-x86 tree, today's linux-next build
(x86 allmodconfig) failed like this:

error: the following would cause module name conflict:
  drivers/misc/c2port/core.ko
  drivers/platform/x86/intel/pmc/core.ko

Caused by commit

  29036fcc92b22d ("platform/x86/intel: intel_pmc_core: Move
intel_pmc_core* files to pmc subfolder")

Since there was nothing in the branch yesterday I've just dropped the
tree entirely.

Yeah, PMC Makefile should keep the object name the same, something like

obj-$(..._PMC_...) += intel_pmc_....o
intel-pmc_...-y := core.o ...

Hi Andy and Mark,
We've found the issue on our side as well and planning to push the fix soon. Would you prefer to have the whole patch series redone or just the fix ?

--
With Best Regards,
Andy Shevchenko