linux-next: build failure after merge of the driver-core tree
in [Kernel]
|
Prev: 2.6.35-rc2-git5 -- [drm:drm_mode_getfb] *ERROR* invalid framebuffer id
Next: CIFS: Make cifs_convert_address() take a const src pointer and a length
From: Stephen Rothwell on 4 Aug 2010 00:30 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(a)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(a)canb.auug.org.au> --- drivers/pci/pci-label.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c index 111500e..90c0a72 100644 --- a/drivers/pci/pci-label.c +++ b/drivers/pci/pci-label.c @@ -97,12 +97,12 @@ smbiosinstance_show(struct device *dev, } static struct device_attribute smbios_attr_label = { - .attr = {.name = "label", .mode = 0444, .owner = THIS_MODULE}, + .attr = {.name = "label", .mode = 0444}, .show = smbioslabel_show, }; static struct device_attribute smbios_attr_instance = { - .attr = {.name = "index", .mode = 0444, .owner = THIS_MODULE}, + .attr = {.name = "index", .mode = 0444}, .show = smbiosinstance_show, }; -- 1.7.1 -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Guenter Roeck on 4 Aug 2010 00:50 On Wed, Aug 04, 2010 at 12:25:31AM -0400, 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): > > From: Stephen Rothwell <sfr(a)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(a)canb.auug.org.au> Acked-by: Guenter Roeck <guenter.roeck(a)ericsson.com> Sorry for the trouble. Looks like I missed that by a day. Guenter > --- > drivers/pci/pci-label.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c > index 111500e..90c0a72 100644 > --- a/drivers/pci/pci-label.c > +++ b/drivers/pci/pci-label.c > @@ -97,12 +97,12 @@ smbiosinstance_show(struct device *dev, > } > > static struct device_attribute smbios_attr_label = { > - .attr = {.name = "label", .mode = 0444, .owner = THIS_MODULE}, > + .attr = {.name = "label", .mode = 0444}, > .show = smbioslabel_show, > }; > > static struct device_attribute smbios_attr_instance = { > - .attr = {.name = "index", .mode = 0444, .owner = THIS_MODULE}, > + .attr = {.name = "index", .mode = 0444}, > .show = smbiosinstance_show, > }; > > -- > 1.7.1 > > -- > Cheers, > Stephen Rothwell sfr(a)canb.auug.org.au > http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 4 Aug 2010 12:00 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-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Jesse Barnes on 4 Aug 2010 17:30
On Wed, 4 Aug 2010 14:25:31 +1000 Stephen Rothwell <sfr(a)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(a)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(a)canb.auug.org.au> Applied, thanks. -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |