From: David Miller <davem@davemloft.net>
To: wei.liu2@citrix.com
Cc: xen-devel@lists.xen.org, netdev@vger.kernel.org,
ian.campbell@citrix.com, wdauchy@gmail.com,
konrad.wilk@oracle.com
Subject: Re: [PATCH V6] Bundle fixes for Xen netfront / netback
Date: Wed, 17 Apr 2013 14:09:00 -0400 (EDT) [thread overview]
Message-ID: <20130417.140900.40803700259873477.davem@davemloft.net> (raw)
In-Reply-To: <1366220523-14579-1-git-send-email-wei.liu2@citrix.com>
From: Wei Liu <wei.liu2@citrix.com>
Date: Wed, 17 Apr 2013 18:41:59 +0100
> Final round of this series. All acked and ready to go in.
Does not apply to net-next.
[davem@drr net-next]$ git am --signoff bundle-4170-xen.mbox
Applying: xen-netfront: frags -> slots in log message
Applying: xen-netfront: reduce gso_max_size to account for max TCP header
Applying: xen-netback: coalesce slots in TX path and fix regressions
error: patch failed: drivers/net/xen-netback/netback.c:1548
error: drivers/net/xen-netback/netback.c: patch does not apply
Patch failed at 0003 xen-netback: coalesce slots in TX path and fix regressions
The copy of the patch that failed is found in:
/home/davem/src/GIT/net-next/.git/rebase-apply/patch
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".
Please stop wasting my time.
next prev parent reply other threads:[~2013-04-17 18:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-17 17:41 [PATCH V6] Bundle fixes for Xen netfront / netback Wei Liu
2013-04-17 17:42 ` [PATCH 1/4] xen-netfront: frags -> slots in log message Wei Liu
2013-04-17 17:42 ` [PATCH 2/4] xen-netfront: reduce gso_max_size to account for max TCP header Wei Liu
2013-04-17 17:42 ` [PATCH 3/4] xen-netback: coalesce slots in TX path and fix regressions Wei Liu
2013-04-17 17:42 ` [PATCH 4/4] xen-netback: don't disconnect frontend when seeing oversize packet Wei Liu
2013-04-17 18:09 ` David Miller [this message]
2013-04-17 18:17 ` [PATCH V6] Bundle fixes for Xen netfront / netback Wei Liu
2013-04-17 19:31 ` [Xen-devel] " Konrad Rzeszutek Wilk
2013-04-17 19:43 ` Wei Liu
2013-04-17 21:21 ` David Miller
2013-04-18 1:20 ` Wei Liu
2013-04-18 7:02 ` Ian Campbell
2013-04-17 21:20 ` 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=20130417.140900.40803700259873477.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=ian.campbell@citrix.com \
--cc=konrad.wilk@oracle.com \
--cc=netdev@vger.kernel.org \
--cc=wdauchy@gmail.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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).