On Wed, Aug 04, 2010 at 02:25:31PM +1000, Stephen Rothwell 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): Thanks, your fix looks correct, that field is now gone. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html