Messages in this thread | | | From | "Rose, Gregory V" <> | Date | Mon, 7 Nov 2011 08:46:35 -0800 | 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
| |