linux-next: build failure after merge of the drivers-x86 tree

linux-next: build failure after merge of the drivers-x86 tree

[Mark Brown]

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.

Re: linux-next: build failure after merge of the drivers-x86 tree

[Andy Shevchenko]

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

RE: linux-next: build failure after merge of the drivers-x86 tree

[Kammela, Gayatri]

> -----Original Message-----
> From: Andy Shevchenko <andy.shevchenko@gmail.com>
> Sent: Wednesday, July 28, 2021 10:02 AM
> To: Mark Brown <broonie@kernel.org>
> Cc: Hans de Goede <hdegoede@redhat.com>; Gross, Mark
> <mark.gross@intel.com>; Kammela, Gayatri <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>
> Subject: Re: linux-next: build failure after merge of the drivers-x86 tree
> 
> 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 ...
> 
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

Re: linux-next: build failure after merge of the drivers-x86 tree

[Hans de Goede]

Hi,

On 7/28/21 7:27 PM, Kammela, Gayatri wrote:
>> -----Original Message-----
>> From: Andy Shevchenko <andy.shevchenko@gmail.com>
>> Sent: Wednesday, July 28, 2021 10:02 AM
>> To: Mark Brown <broonie@kernel.org>
>> Cc: Hans de Goede <hdegoede@redhat.com>; Gross, Mark
>> <mark.gross@intel.com>; Kammela, Gayatri <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>
>> Subject: Re: linux-next: build failure after merge of the drivers-x86 tree
>>
>> 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 ...

Right, I will drop the patches from pdx86/for-next and do a forced push.

> 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 ?

I've just dropped the current version of the patches,
please send the whole patch series redone.

Thanks & Regards,

Hans

RE: linux-next: build failure after merge of the drivers-x86 tree

[Kammela, Gayatri]

> -----Original Message-----
> From: Hans de Goede <hdegoede@redhat.com>
> Sent: Wednesday, July 28, 2021 10:56 AM
> To: Kammela, Gayatri <gayatri.kammela@intel.com>; Andy Shevchenko
> <andy.shevchenko@gmail.com>; Mark Brown <broonie@kernel.org>
> Cc: Gross, Mark <mark.gross@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>
> Subject: Re: linux-next: build failure after merge of the drivers-x86 tree
> 
> Hi,
> 
> On 7/28/21 7:27 PM, Kammela, Gayatri wrote:
> >> -----Original Message-----
> >> From: Andy Shevchenko <andy.shevchenko@gmail.com>
> >> Sent: Wednesday, July 28, 2021 10:02 AM
> >> To: Mark Brown <broonie@kernel.org>
> >> Cc: Hans de Goede <hdegoede@redhat.com>; Gross, Mark
> >> <mark.gross@intel.com>; Kammela, Gayatri
> <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>
> >> Subject: Re: linux-next: build failure after merge of the drivers-x86
> >> tree
> >>
> >> 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 ...
> 
> Right, I will drop the patches from pdx86/for-next and do a forced push.
> 
> > 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
> ?
> 
> I've just dropped the current version of the patches, please send the whole
> patch series redone.
Sure Hans! I will send the whole patch series redone.
> 
> Thanks & Regards,
> 
> Hans

Re: linux-next: build failure after merge of the drivers-x86 tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 675 bytes --]

On Tue, 22 Feb 2011 14:34:34 +0000 Matthew Garrett <mjg59@srcf.ucam.org> wrote:
>
> On Tue, Feb 22, 2011 at 08:46:01PM +0900, Mattia Dongili wrote:
> 
> > how does linux-next work? should this patch be a separate commit or can
> > it be folded into the offending one?
> 
> I'll fold it into the offending one and repush. Sorry about the 
> breakage, Stephen - I don't have DEBUG_ALLOC enabled so didn't see the 
> failure. Do you build with a defined configuration I can test against?

As the original report said, this was an x86_64 allmodconfig build.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the drivers-x86 tree

[Matthew Garrett]

On Tue, Feb 22, 2011 at 08:46:01PM +0900, Mattia Dongili wrote:

> how does linux-next work? should this patch be a separate commit or can
> it be folded into the offending one?

I'll fold it into the offending one and repush. Sorry about the 
breakage, Stephen - I don't have DEBUG_ALLOC enabled so didn't see the 
failure. Do you build with a defined configuration I can test against?

-- 
Matthew Garrett | mjg59@srcf.ucam.org

Re: linux-next: build failure after merge of the drivers-x86 tree

[Mattia Dongili]

On Tue, Feb 22, 2011 at 03:26:53PM +0900, Mattia Dongili wrote:
> 
> 
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> >Hi Matthew,
> >
> >After merging the drivers-x86 tree, today's linux-next build (x86_64
> >allmodconfig) failed like this:
> 
> Apologies, I didn't test my code with
> DEBUG_LOCK_ALLOC=y.
> I'll send a fix in as soon as I get around a usable network
> connection.

the below patch fixes the build failure.

how does linux-next work? should this patch be a separate commit or can
it be folded into the offending one?

diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a097a27..a0ba0e7 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -769,7 +769,7 @@ static int sony_nc_handles_setup(struct platform_device *pd)
 
 	handles = kzalloc(sizeof(*handles), GFP_KERNEL);
 
-	sysfs_attr_init(handles->devattr);
+	sysfs_attr_init(&handles->devattr.attr);
 	handles->devattr.attr.name = "handles";
 	handles->devattr.attr.mode = S_IRUGO;
 	handles->devattr.show = sony_nc_handles_show;
@@ -1459,13 +1459,13 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd)
 
 	kbdbl_handle = kzalloc(sizeof(*kbdbl_handle), GFP_KERNEL);
 
-	sysfs_attr_init(kbdbl_handle->mode_attr);
+	sysfs_attr_init(&kbdbl_handle->mode_attr.attr);
 	kbdbl_handle->mode_attr.attr.name = "kbd_backlight";
 	kbdbl_handle->mode_attr.attr.mode = S_IRUGO | S_IWUSR;
 	kbdbl_handle->mode_attr.show = sony_nc_kbd_backlight_mode_show;
 	kbdbl_handle->mode_attr.store = sony_nc_kbd_backlight_mode_store;
 
-	sysfs_attr_init(kbdbl_handle->timeout_attr);
+	sysfs_attr_init(&kbdbl_handle->timeout_attr.attr);
 	kbdbl_handle->timeout_attr.attr.name = "kbd_backlight_timeout";
 	kbdbl_handle->timeout_attr.attr.mode = S_IRUGO | S_IWUSR;
 	kbdbl_handle->timeout_attr.show = sony_nc_kbd_backlight_timeout_show;
-- 
mattia
:wq!