* linux-next: build failure after merge of the origin tree @ 2011-11-06 23:12 Stephen Rothwell 2011-11-07 1:52 ` David Miller 0 siblings, 1 reply; 7+ messages in thread From: Stephen Rothwell @ 2011-11-06 23:12 UTC (permalink / raw) To: Linus Torvalds Cc: linux-next, linux-kernel, Greg Rose, Jeff Kirsher, David Miller, netdev [-- Attachment #1: Type: text/plain, Size: 864 bytes --] Hi Linus, Starting with the origin tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: drivers/net/ethernet/intel/ixgbe/ixgbe_main.c: In function 'ixgbe_set_interrupt_capability': drivers/net/ethernet/intel/ixgbe/ixgbe_main.c:4724:3: error: implicit declaration of function 'ixgbe_disable_sriov' drivers/net/ethernet/intel/ixgbe/ixgbe_main.c: In function 'ixgbe_remove': drivers/net/ethernet/intel/ixgbe/ixgbe_main.c:7773:3: error: implicit declaration of function 'ixgbe_check_vf_assignment' Caused by commit 9487dc844054 ("ixgbe: Fix compiler warnings") which hid the declarations of ixgbe_disable_sriov() and ixgbe_check_vf_assignment() when CONFIG_PCI_IOV is not defined. I have reverted that commit for today. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: build failure after merge of the origin tree 2011-11-06 23:12 linux-next: build failure after merge of the origin tree Stephen Rothwell @ 2011-11-07 1:52 ` David Miller 2011-11-07 2:47 ` Stephen Rothwell 0 siblings, 1 reply; 7+ messages in thread From: David Miller @ 2011-11-07 1:52 UTC (permalink / raw) To: sfr Cc: torvalds, linux-next, linux-kernel, gregory.v.rose, jeffrey.t.kirsher, netdev From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 7 Nov 2011 10:12:02 +1100 > Starting with the origin tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: ... > Caused by commit 9487dc844054 ("ixgbe: Fix compiler warnings") which hid > the declarations of ixgbe_disable_sriov() and ixgbe_check_vf_assignment() > when CONFIG_PCI_IOV is not defined. > > I have reverted that commit for today. It should be fixed in net.git, can you please check that the build succeeds after you pull it into -next? If you just revert the commit in origin from -next, then you will get conflicts with you pull the net.git tree in. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: build failure after merge of the origin tree 2011-11-07 1:52 ` David Miller @ 2011-11-07 2:47 ` Stephen Rothwell 2011-11-07 3:36 ` David Miller 0 siblings, 1 reply; 7+ messages in thread From: Stephen Rothwell @ 2011-11-07 2:47 UTC (permalink / raw) To: David Miller Cc: torvalds, linux-next, linux-kernel, gregory.v.rose, jeffrey.t.kirsher, netdev [-- Attachment #1: Type: text/plain, Size: 1136 bytes --] Hi Dave, On Sun, 06 Nov 2011 20:52:59 -0500 (EST) David Miller <davem@davemloft.net> wrote: > > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Mon, 7 Nov 2011 10:12:02 +1100 > > > Starting with the origin tree, today's linux-next build (powerpc > > ppc64_defconfig) failed like this: > ... > > Caused by commit 9487dc844054 ("ixgbe: Fix compiler warnings") which hid > > the declarations of ixgbe_disable_sriov() and ixgbe_check_vf_assignment() > > when CONFIG_PCI_IOV is not defined. > > > > I have reverted that commit for today. > > It should be fixed in net.git, can you please check that the build > succeeds after you pull it into -next? I reverted the commit above ... > If you just revert the commit in origin from -next, then you will get > conflicts with you pull the net.git tree in. I got no conflicts when I merged in the net tree and can see no fix for this problem in the net tree. My current head of the net tree is 1a6422f "etherh: Add MAINTAINERS entry for etherh". -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: build failure after merge of the origin tree 2011-11-07 2:47 ` Stephen Rothwell @ 2011-11-07 3:36 ` David Miller 2011-11-07 5:29 ` Kirsher, Jeffrey T 0 siblings, 1 reply; 7+ messages in thread From: David Miller @ 2011-11-07 3:36 UTC (permalink / raw) To: sfr Cc: torvalds, linux-next, linux-kernel, gregory.v.rose, jeffrey.t.kirsher, netdev From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 7 Nov 2011 13:47:06 +1100 >> If you just revert the commit in origin from -next, then you will get >> conflicts with you pull the net.git tree in. > > I got no conflicts when I merged in the net tree and can see no fix for > this problem in the net tree. My current head of the net tree is 1a6422f > "etherh: Add MAINTAINERS entry for etherh". Ok, Jeff please take a look at this and send me a fix soon. Thanks. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: build failure after merge of the origin tree 2011-11-07 3:36 ` David Miller @ 2011-11-07 5:29 ` Kirsher, Jeffrey T 2011-11-07 16:46 ` Rose, Gregory V 0 siblings, 1 reply; 7+ messages in thread From: Kirsher, Jeffrey T @ 2011-11-07 5:29 UTC (permalink / raw) To: David Miller Cc: sfr, torvalds, linux-next, linux-kernel, Rose, Gregory V, netdev Cheers, Jeff On Nov 6, 2011, at 19:38, "David Miller" <davem@davemloft.net> wrote: > From: Stephen Rothwell <sfr@canb.auug.org.au> > Date: Mon, 7 Nov 2011 13:47:06 +1100 > >>> If you just revert the commit in origin from -next, then you will get >>> conflicts with you pull the net.git tree in. >> >> I got no conflicts when I merged in the net tree and can see no fix for >> this problem in the net tree. My current head of the net tree is 1a6422f >> "etherh: Add MAINTAINERS entry for etherh". > > Ok, Jeff please take a look at this and send me a fix soon. > > Thanks. Ok Dave, at this point, I am puttying together a patch to revert this fix since it appears that more trouble comes with this fix. I will take a look at it quickly before sending out a patch to fix the issue. ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: linux-next: build failure after merge of the origin tree 2011-11-07 5:29 ` Kirsher, Jeffrey T @ 2011-11-07 16:46 ` Rose, Gregory V 2011-11-07 17:46 ` Rose, Gregory V 0 siblings, 1 reply; 7+ messages in thread From: Rose, Gregory V @ 2011-11-07 16:46 UTC (permalink / raw) To: Kirsher, Jeffrey T, David Miller Cc: sfr, torvalds, linux-next, linux-kernel, netdev > -----Original Message----- > From: Kirsher, Jeffrey T > Sent: Sunday, November 06, 2011 9:30 PM > To: David Miller > Cc: sfr@canb.auug.org.au; torvalds@linux-foundation.org; linux- > next@vger.kernel.org; linux-kernel@vger.kernel.org; Rose, Gregory V; > netdev@vger.kernel.org > Subject: Re: linux-next: build failure after merge of the origin tree > > > > Cheers, > Jeff > > On Nov 6, 2011, at 19:38, "David Miller" <davem@davemloft.net> wrote: > > > From: Stephen Rothwell <sfr@canb.auug.org.au> > > Date: Mon, 7 Nov 2011 13:47:06 +1100 > > > >>> If you just revert the commit in origin from -next, then you will get > >>> conflicts with you pull the net.git tree in. > >> > >> I got no conflicts when I merged in the net tree and can see no fix for > >> this problem in the net tree. My current head of the net tree is > 1a6422f > >> "etherh: Add MAINTAINERS entry for etherh". > > > > Ok, Jeff please take a look at this and send me a fix soon. > > > > Thanks. > > Ok Dave, at this point, I am puttying together a patch to revert this fix > since it appears that more trouble comes with this fix. I will take a > look at it quickly before sending out a patch to fix the issue. My bad... I fixed a compiler warning that occurred with CONFIG_PCI_IOV turned on and didn't realize that my patch would cause an error when turning it back off. I'll have it fixed ASAP. - Greg ^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: linux-next: build failure after merge of the origin tree 2011-11-07 16:46 ` Rose, Gregory V @ 2011-11-07 17:46 ` Rose, Gregory V 0 siblings, 0 replies; 7+ messages in thread From: Rose, Gregory V @ 2011-11-07 17:46 UTC (permalink / raw) To: Rose, Gregory V, Kirsher, Jeffrey T, David Miller Cc: sfr, torvalds, linux-next, linux-kernel, netdev [-- Attachment #1: Type: text/plain, Size: 2308 bytes --] > -----Original Message----- > From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] > On Behalf Of Rose, Gregory V > Sent: Monday, November 07, 2011 8:47 AM > To: Kirsher, Jeffrey T; David Miller > Cc: sfr@canb.auug.org.au; torvalds@linux-foundation.org; linux- > next@vger.kernel.org; linux-kernel@vger.kernel.org; netdev@vger.kernel.org > Subject: RE: linux-next: build failure after merge of the origin tree > > > > > -----Original Message----- > > From: Kirsher, Jeffrey T > > Sent: Sunday, November 06, 2011 9:30 PM > > To: David Miller > > Cc: sfr@canb.auug.org.au; torvalds@linux-foundation.org; linux- > > next@vger.kernel.org; linux-kernel@vger.kernel.org; Rose, Gregory V; > > netdev@vger.kernel.org > > Subject: Re: linux-next: build failure after merge of the origin tree > > > > > > > > Cheers, > > Jeff > > > > On Nov 6, 2011, at 19:38, "David Miller" <davem@davemloft.net> wrote: > > > > > From: Stephen Rothwell <sfr@canb.auug.org.au> > > > Date: Mon, 7 Nov 2011 13:47:06 +1100 > > > > > >>> If you just revert the commit in origin from -next, then you will > get > > >>> conflicts with you pull the net.git tree in. > > >> > > >> I got no conflicts when I merged in the net tree and can see no fix > for > > >> this problem in the net tree. My current head of the net tree is > > 1a6422f > > >> "etherh: Add MAINTAINERS entry for etherh". > > > > > > Ok, Jeff please take a look at this and send me a fix soon. > > > > > > Thanks. > > > > Ok Dave, at this point, I am puttying together a patch to revert this > fix > > since it appears that more trouble comes with this fix. I will take a > > look at it quickly before sending out a patch to fix the issue. > > My bad... I fixed a compiler warning that occurred with CONFIG_PCI_IOV > turned on and didn't realize that my patch would cause an error when > turning it back off. > > I'll have it fixed ASAP. > > - Greg I have posted a fix for this problem to netdev and attached it to this email. Again, my apologies for the mix up. - Greg > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html [-- Attachment #2: Type: message/rfc822, Size: 5342 bytes --] From: "Rose, Gregory V" <gregory.v.rose@intel.com> To: "netdev@vger.kernel.org" <netdev@vger.kernel.org> Cc: "davem@davemloft.net" <davem@davemloft.net> Subject: [net-ext PATCH] ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined Date: Mon, 7 Nov 2011 09:44:17 -0800 Message-ID: <20111107174417.8638.87569.stgit@gitlad.jf.intel.com> Fix compiler errors and warnings with CONFIG_PCI_IOV defined and not defined. Signed-off-by: Greg Rose <gregory.v.rose@intel.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 ++ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c index db95731..00fcd39 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c @@ -442,12 +442,14 @@ static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter, int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter) { +#ifdef CONFIG_PCI_IOV int i; for (i = 0; i < adapter->num_vfs; i++) { if (adapter->vfinfo[i].vfdev->dev_flags & PCI_DEV_FLAGS_ASSIGNED) return true; } +#endif return false; } diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h index 4a5d889..df04f1a 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h @@ -42,11 +42,11 @@ int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting); int ixgbe_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi); void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter); -#ifdef CONFIG_PCI_IOV void ixgbe_disable_sriov(struct ixgbe_adapter *adapter); +int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter); +#ifdef CONFIG_PCI_IOV void ixgbe_enable_sriov(struct ixgbe_adapter *adapter, const struct ixgbe_info *ii); -int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter); #endif -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-11-07 17:46 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-11-06 23:12 linux-next: build failure after merge of the origin tree Stephen Rothwell 2011-11-07 1:52 ` David Miller 2011-11-07 2:47 ` Stephen Rothwell 2011-11-07 3:36 ` David Miller 2011-11-07 5:29 ` Kirsher, Jeffrey T 2011-11-07 16:46 ` Rose, Gregory V 2011-11-07 17:46 ` Rose, Gregory V
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).