From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id AD328ADA7 for ; Mon, 18 May 2015 12:54:51 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP; 18 May 2015 03:54:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,453,1427785200"; d="scan'208";a="711816378" Received: from bricha3-mobl3.ger.corp.intel.com ([10.237.221.63]) by fmsmga001.fm.intel.com with SMTP; 18 May 2015 03:54:49 -0700 Received: by (sSMTP sendmail emulation); Mon, 18 May 2015 11:54:48 +0025 Date: Mon, 18 May 2015 11:54:48 +0100 From: Bruce Richardson To: Thomas F Herbert Message-ID: <20150518105448.GA7296@bricha3-MOBL3> References: <55578842.8020805@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <55578842.8020805@redhat.com> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: "dev@dpdk.org" Subject: Re: [dpdk-dev] [PATCH v2 05/19] e1000: move e1000 pmd to drivers/net directory X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2015 10:54:52 -0000 On Sat, May 16, 2015 at 02:11:14PM -0400, Thomas F Herbert wrote: > On 5/15/15 11:56 AM, Bruce Richardson wrote:> Move e1000 pmd to drivers/net > directory > > As part of move, rename "e1000" subdirectory, which contains the code > > from the "base driver", to "base". > > > > Signed-off-by: Bruce Richardson > Bruce, > > Thanks! > > I tried applying the series to master and everything was fine until I got to > patch 5 which didn't apply. See below. > > This patch for the e1000 seems extremely long. Is it trying to re-create all > new files for the e1000 driver? It is 91000 lines long!! > > --TFH The e1000 patch seems to apply ok to latest head in my testing. However, the base driver code for i40e has been applied which prevents patch 8 from applying. /Bruce > > git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_04_19__bond__Move_bonded_ethdev_pmd_to_drivers_net-20150515-1235382.txt > [therbert@Fedora21 dpdk]$ git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt > ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:322: > trailing whitespace. > > ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:325: > trailing whitespace. > > ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:329: > trailing whitespace. > > ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:339: > trailing whitespace. > > ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:28770: > trailing whitespace. > Copyright (c) 2001-2014, Intel Corporation > error: patch failed: lib/librte_pmd_e1000/e1000/e1000_phy.c:1 > error: lib/librte_pmd_e1000/e1000/e1000_phy.c: patch does not appl > > --- > > drivers/net/Makefile | 2 +- > > drivers/net/e1000/Makefile | 99 + > -- > Thomas F Herbert > Principal Software Engineer > Red Hat > therbert@redhat.com