Re: linux-next: build failure after merge of the driver-core tree

Jesse Barnes
2010-08-04T21:24:15Z

On Wed, 4 Aug 2010 14:25:31 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Greg,
>
> After merging the driver-core tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pci/pci-label.c:100: error: unknown field 'owner' specified in initializer
> drivers/pci/pci-label.c:100: warning: initialization from incompatible pointer type
> drivers/pci/pci-label.c:105: error: unknown field 'owner' specified in initializer
> drivers/pci/pci-label.c:105: warning: initialization from incompatible pointer type
>
> Caused by commit 60cc62ad579afa0eb5bded82e08dd0617d461d52 ("sysfs: Remove
> owner field from sysfs struct attribute") interacting with commit
> 911e1c9b05a8e3559a7aa89083930700a0b9e7ee ("PCI: export SMBIOS provided
> firmware instance and label to sysfs") from the pci tree.
>
> I applied the following merge fix patch (Jesse, this patch can already be
> applied to the pci tree without problems):
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 4 Aug 2010 14:21:42 +1000
> Subject: [PATCH] pci: update for owner removal from struct device_attribute
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

Applied, thanks.

--
Jesse Barnes, Intel Open Source Technology Center