Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20210728164847.46855-1-broonie@kernel.org>
In-Reply-To: <20210728164847.46855-1-broonie@kernel.org>
From:   Andy Shevchenko <andy.shevchenko@gmail.com>
Date:   Wed, 28 Jul 2021 20:01:45 +0300
Message-ID: <CAHp75VcP2V2j_ZHtc9y9Jw527E8PZaoFngsXD3oA0Yvmm=L4SA@mail.gmail.com>
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree
To:     Mark Brown <broonie@kernel.org>
Cc:     Hans de Goede <hdegoede@redhat.com>,
        Mark Gross <mark.gross@intel.com>,
        Gayatri Kammela <gayatri.kammela@intel.com>,
        Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Platform Driver <platform-driver-x86@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, Jul 28, 2021 at 7:49 PM Mark Brown <broonie@kernel.org> wrote:
>
> 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 ...


-- 
With Best Regards,
Andy Shevchenko