Re: [Xen-devel] [PATCH V6] Bundle fixes for Xen netfront / netback

[David Miller <davem@xxxxxxxxxxxxx>]

From: Wei Liu <wei.liu2@xxxxxxxxxx>
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.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel