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 at 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 at 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 at redhat.com
