[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

On Wed, Apr 17, 2013 at 07:09:00PM +0100, David Miller wrote:
> 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.

Sorry Dave, I didn't mean to waste your time. I will rebase my patches
and post the really final series.


Xen-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.