From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bruce Richardson <bruce.richardson@intel.com>
Subject: Re: [PATCH v2 05/19] e1000: move e1000 pmd to
 drivers/net directory
Date: Mon, 18 May 2015 11:54:48 +0100
Message-ID: <20150518105448.GA7296@bricha3-MOBL3>
References: <55578842.8020805@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: "dev@dpdk.org" <dev@dpdk.org>
To: Thomas F Herbert <therbert@redhat.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by dpdk.org (Postfix) with ESMTP id AD328ADA7
 for <dev@dpdk.org>; Mon, 18 May 2015 12:54:51 +0200 (CEST)
Content-Disposition: inline
In-Reply-To: <55578842.8020805@redhat.com>
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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.richardson@intel.com>
> 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