From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rose, Gregory V" Subject: RE: linux-next: build failure after merge of the origin tree Date: Mon, 7 Nov 2011 08:46:35 -0800 Message-ID: <43F901BD926A4E43B106BF17856F075501A1CCA399@orsmsx508.amr.corp.intel.com> References: <20111107101202.96fcb76d580e5265bd99aeee@canb.auug.org.au> <20111106.205259.1237400984015921904.davem@davemloft.net> <20111107134706.3e7fc633f913b5e155153127@canb.auug.org.au> <20111106.223619.1348742215191441592.davem@davemloft.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT Return-path: Received: from mga14.intel.com ([143.182.124.37]:24684 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755190Ab1KGQqk convert rfc822-to-8bit (ORCPT ); Mon, 7 Nov 2011 11:46:40 -0500 In-Reply-To: Content-Language: en-US Sender: linux-next-owner@vger.kernel.org List-ID: 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" > -----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" wrote: > > > From: Stephen Rothwell > > 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