netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: eric.dumazet@gmail.com
Cc: netdev@vger.kernel.org, mcarlson@broadcom.com, mchan@broadcom.com
Subject: Re: [PATCH net-next] tg3: use netdev_alloc_frag() API
Date: Sat, 19 May 2012 03:19:14 -0400 (EDT)	[thread overview]
Message-ID: <20120519.031914.1744866102736414778.davem@davemloft.net> (raw)
In-Reply-To: <1337411749.7029.77.camel@edumazet-glaptop>

From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sat, 19 May 2012 09:15:49 +0200

> From: Eric Dumazet <edumazet@google.com>
> 
> Update our reference driver to use netdev_alloc_frag() API instead of
> the temporary custom allocator I introduced in commit 8d4057a938
> (tg3: provide frags as skb head)
> 
> This removes the memory leak we had, since we could leak one page at
> device dismantle.
> 
> Signed-off-by: Eric Dumazet <edumazet@google.com>

Hmmm, doesn't apply cleanly to net-next for some reason:

[davem@drr net-next]$ git am --signoff net-next-tg3-use-netdev_alloc_frag-API.patch 
Applying: tg3: use netdev_alloc_frag() API
error: patch failed: drivers/net/ethernet/broadcom/tg3.c:5631
error: drivers/net/ethernet/broadcom/tg3.c: patch does not apply
Patch failed at 0001 tg3: use netdev_alloc_frag() API
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

  reply	other threads:[~2012-05-19  7:19 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-19  7:15 [PATCH net-next] tg3: use netdev_alloc_frag() API Eric Dumazet
2012-05-19  7:19 ` David Miller [this message]
2012-05-19  7:31   ` Eric Dumazet
2012-05-19  8:01     ` David Miller
2012-05-19  8:17       ` Eric Dumazet
2012-05-19  7:33 ` [PATCH v2 " Eric Dumazet
2012-05-19  8:03   ` David Miller

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=20120519.031914.1744866102736414778.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=mcarlson@broadcom.com \
    --cc=mchan@broadcom.com \
    --cc=netdev@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).