From mboxrd@z Thu Jan  1 00:00:00 1970
From: Thomas F Herbert <therbert@redhat.com>
Subject: [PATCH v2 05/19] e1000: move e1000 pmd to drivers/net
 directory
Date: Sat, 16 May 2015 14:11:14 -0400
Message-ID: <55578842.8020805@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
To: Bruce Richardson <bruce.richardson@intel.com>,
 "dev@dpdk.org" <dev@dpdk.org>
Return-path: <dev-bounces@dpdk.org>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
 by dpdk.org (Postfix) with ESMTP id 74FC45A5C
 for <dev@dpdk.org>; Sat, 16 May 2015 20:11:16 +0200 (CEST)
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 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

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