From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751767Ab1KGF3k (ORCPT ); Mon, 7 Nov 2011 00:29:40 -0500 Received: from mga02.intel.com ([134.134.136.20]:32398 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750771Ab1KGF3i convert rfc822-to-8bit (ORCPT ); Mon, 7 Nov 2011 00:29:38 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.67,351,1309762800"; d="scan'208";a="71715472" From: "Kirsher, Jeffrey T" 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" Date: Sun, 6 Nov 2011 21:29:36 -0800 Subject: Re: linux-next: build failure after merge of the origin tree Thread-Topic: linux-next: build failure after merge of the origin tree Thread-Index: AcydDjzzNn/sMOVzTpeMq++Cpu1Xow== Message-ID: 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> In-Reply-To: <20111106.223619.1348742215191441592.davem@davemloft.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.