From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755484Ab0HDPxM (ORCPT ); Wed, 4 Aug 2010 11:53:12 -0400 Received: from kroah.org ([198.145.64.141]:59919 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754426Ab0HDPxJ (ORCPT ); Wed, 4 Aug 2010 11:53:09 -0400 Date: Wed, 4 Aug 2010 08:52:13 -0700 From: Greg KH To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Narendra K , Jordan Hargrave , Jesse Barnes , Guenter Roeck Subject: Re: linux-next: build failure after merge of the driver-core tree Message-ID: <20100804155213.GA27244@kroah.com> References: <20100804142531.aea95c0b.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100804142531.aea95c0b.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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