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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130417181740.GF5815@zion.uk.xensource.com>
Date:	Wed, 17 Apr 2013 19:17:40 +0100
From:	Wei Liu <wei.liu2@...rix.com>
To:	David Miller <davem@...emloft.net>
CC:	Wei Liu <wei.liu2@...rix.com>,
	"xen-devel@...ts.xen.org" <xen-devel@...ts.xen.org>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	Ian Campbell <Ian.Campbell@...rix.com>,
	"wdauchy@...il.com" <wdauchy@...il.com>,
	"konrad.wilk@...cle.com" <konrad.wilk@...cle.com>
Subject: Re: [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@...rix.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.

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


Wei.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html