From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 74FC45A5C for ; Sat, 16 May 2015 20:11:16 +0200 (CEST) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 8986DC6569; Sat, 16 May 2015 18:11:15 +0000 (UTC) Received: from tfherb.local (vpn-63-71.rdu2.redhat.com [10.10.63.71]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4GIBEJv019224; Sat, 16 May 2015 14:11:15 -0400 Message-ID: <55578842.8020805@redhat.com> Date: Sat, 16 May 2015 14:11:14 -0400 From: Thomas F Herbert Organization: Red Hat User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Bruce Richardson , "dev@dpdk.org" Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Subject: [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: Sat, 16 May 2015 18:11:16 -0000 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 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