All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas F Herbert <therbert@redhat.com>
To: Bruce Richardson <bruce.richardson@intel.com>,
	"dev@dpdk.org" <dev@dpdk.org>
Subject: [PATCH v2 05/19] e1000: move e1000 pmd to drivers/net directory
Date: Sat, 16 May 2015 14:11:14 -0400	[thread overview]
Message-ID: <55578842.8020805@redhat.com> (raw)

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

             reply	other threads:[~2015-05-16 18:11 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-16 18:11 Thomas F Herbert [this message]
2015-05-18  9:35 ` [PATCH v2 05/19] e1000: move e1000 pmd to drivers/net directory Bruce Richardson
2015-05-18 10:54 ` Bruce Richardson
2015-05-18 15:29   ` Thomas F Herbert
  -- strict thread matches above, loose matches on Subject: below --
2015-05-12 17:04 [PATCH 00/19] Move PMDs to drivers directory Bruce Richardson
2015-05-15 15:56 ` [PATCH v2 " Bruce Richardson
2015-05-15 15:56   ` [PATCH v2 05/19] e1000: move e1000 pmd to drivers/net directory Bruce Richardson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=55578842.8020805@redhat.com \
    --to=therbert@redhat.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.